Skip to content

Commit

Permalink
Rename Player.x|y -> .qWorldX|qWorldY and SpecialStagePlayer.x -> .q1… (
Browse files Browse the repository at this point in the history
#177)

* Rename Player.x|y -> .qWorldX|qWorldY and SpecialStagePlayer.x -> .q16WorldX|.q16WorldY

* Align Music Manager with SA1

* stage/game_2 -> grind_effect_2

* SpriteTransform.x|y -> .qScaleX|Y

* Auto-insert platform #define for convenience
  • Loading branch information
JaceCear authored Jan 5, 2025
1 parent 4aa35ee commit ac3c4eb
Show file tree
Hide file tree
Showing 140 changed files with 2,214 additions and 1,400 deletions.
4 changes: 2 additions & 2 deletions asm/non_matching/game/stage/Task_RingsMgrMain.inc
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ _08008166:
movs r0, #0xff
_080081A4:
strb r0, [r1]
ldr r1, _080082BC @ =gUnknown_030054A8
ldr r1, _080082BC @ =gMusicManagerState
movs r0, #0x10
strb r0, [r1, #3]
_080081AC:
Expand Down Expand Up @@ -475,7 +475,7 @@ _080082AC: .4byte gPlayer + 0x8
_080082B0: .4byte gRingCount
_080082B4: .4byte gGameMode
_080082B8: .4byte gNumLives
_080082BC: .4byte gUnknown_030054A8
_080082BC: .4byte gMusicManagerState
_080082C0: .4byte 0x04000128
_080082C4: .4byte gMultiplayerPlayerTasks
_080082C8: .4byte IWRAM_START + 0x52
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ _08020620:
movs r0, #0xff
_0802066A:
strb r0, [r1]
ldr r1, _080206BC @ =gUnknown_030054A8
ldr r1, _080206BC @ =gMusicManagerState
movs r0, #0x10
strb r0, [r1, #3]
_08020672:
Expand Down Expand Up @@ -215,7 +215,7 @@ _080206AC: .4byte gRingCount
_080206B0: .4byte gCurrentLevel
_080206B4: .4byte gGameMode
_080206B8: .4byte gNumLives
_080206BC: .4byte gUnknown_030054A8
_080206BC: .4byte gMusicManagerState
_080206C0:
adds r3, r5, #0
adds r3, #0x14
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ _08020ABE:
movs r0, #0xff
_08020B0A:
strb r0, [r1]
ldr r1, _08020B4C @ =gUnknown_030054A8
ldr r1, _08020B4C @ =gMusicManagerState
movs r0, #0x10
strb r0, [r1, #3]
_08020B12:
Expand Down Expand Up @@ -220,7 +220,7 @@ _08020B3C: .4byte gRingCount
_08020B40: .4byte gCurrentLevel
_08020B44: .4byte gGameMode
_08020B48: .4byte gNumLives
_08020B4C: .4byte gUnknown_030054A8
_08020B4C: .4byte gMusicManagerState
_08020B50:
adds r4, r5, #0
adds r4, #0x14
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ _08020FAA:
movs r0, #0xff
_08020FF6:
strb r0, [r1]
ldr r1, _08021040 @ =gUnknown_030054A8
ldr r1, _08021040 @ =gMusicManagerState
movs r0, #0x10
strb r0, [r1, #3]
_08020FFE:
Expand Down Expand Up @@ -274,7 +274,7 @@ _08021030: .4byte gRingCount
_08021034: .4byte gCurrentLevel
_08021038: .4byte gGameMode
_0802103C: .4byte gNumLives
_08021040: .4byte gUnknown_030054A8
_08021040: .4byte gMusicManagerState
_08021044:
adds r4, r5, #0
adds r4, #0x14
Expand Down
5 changes: 3 additions & 2 deletions genctx.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,9 @@ def search_directories(*patterns):
print_order = tuple(ts.static_order())

with open('ctx.c', 'w') as context:
# Since the context is only used for matching anyway, auto-insert
context.write("#define PLATFORM_GBA 1\n\n")

for header in print_order:
exclude = False
for e in excluded:
Expand All @@ -72,5 +75,3 @@ def search_directories(*patterns):
if not exclude:
print(header)
context.write(data[header])


Loading

0 comments on commit ac3c4eb

Please sign in to comment.