Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Identify more WRAM labels, and start a <X>_DummyFunction label convention

Browse Source
This commit is contained in:
Rangi
2020-10-28 13:35:39 -04:00
parent 6d333bed5f
commit ea426a8879
42 changed files with 255 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
engine/overworld/events.asm
View File

@@ -812,7 +812,7 @@ PlayerMovement:
CheckMenuOW:
xor a
ldh [hMenuReturn], a
ldh [hUnusedFFA1], a
ldh [hUnusedByte], a
ldh a, [hJoyPressed]
bit SELECT_F, a

12
engine/overworld/scripting.asm
View File

@@ -458,11 +458,11 @@ Script_verbosegiveitem:
ld de, GiveItemScript
jp ScriptCall
ret_96f76:
GiveItemScript_DummyFunction:
ret
GiveItemScript:
callasm ret_96f76
callasm GiveItemScript_DummyFunction
writetext .ReceivedItemText
iffalse .Full
waitsfx
@@ -2316,13 +2316,13 @@ Script_endall:
ret
Script_halloffame:
ld hl, wGameTimerPause
res GAMETIMERPAUSE_TIMER_PAUSED_F, [hl]
ld hl, wGameTimerPaused
res GAME_TIMER_PAUSED_F, [hl]
farcall StubbedTrainerRankings_HallOfFame
farcall StubbedTrainerRankings_HallOfFame2
farcall HallOfFame
ld hl, wGameTimerPause
set GAMETIMERPAUSE_TIMER_PAUSED_F, [hl]
ld hl, wGameTimerPaused
set GAME_TIMER_PAUSED_F, [hl]
jr ReturnFromCredits
Script_credits: