diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/constants/misc_constants.asm | 16 | ||||
| -rw-r--r-- | src/engine/bank3.asm | 14 | ||||
| -rw-r--r-- | src/engine/bank4.asm | 10 | ||||
| -rw-r--r-- | src/engine/home.asm | 18 | ||||
| -rw-r--r-- | src/wram.asm | 2 |
5 files changed, 30 insertions, 30 deletions
diff --git a/src/constants/misc_constants.asm b/src/constants/misc_constants.asm index c1e3bf1..a6511df 100644 --- a/src/constants/misc_constants.asm +++ b/src/constants/misc_constants.asm @@ -25,13 +25,13 @@ D_DOWN EQU 1 << D_DOWN_F ; $80 BUTTONS EQU A_BUTTON | B_BUTTON | SELECT | START ; $0f D_PAD EQU D_RIGHT | D_LEFT | D_UP | D_DOWN ; $f0 -; Game event constants (wGameEventIndex) +; Game event constants (wGameEvent) const_def - const GAME_EVENT_CONTINUE_FROM_DIARY_OR_NEW_GAME ; $0 - const GAME_EVENT_DUEL ; $1 - const GAME_EVENT_BATTLE_CENTER ; $2 - const GAME_EVENT_GIFT_CENTER ; $3 - const GAME_EVENT_CREDITS ; $4 - const GAME_EVENT_CONTINUE_DUEL ; $5 - const GAME_EVENT_CHALLENGE_MACHINE ; $6 + const GAME_EVENT_OVERWORLD ; $0 + const GAME_EVENT_DUEL ; $1 + const GAME_EVENT_BATTLE_CENTER ; $2 + const GAME_EVENT_GIFT_CENTER ; $3 + const GAME_EVENT_CREDITS ; $4 + const GAME_EVENT_CONTINUE_DUEL ; $5 + const GAME_EVENT_CHALLENGE_MACHINE ; $6 NUM_GAME_EVENTS EQU const_value diff --git a/src/engine/bank3.asm b/src/engine/bank3.asm index 3612854..1fc8f11 100644 --- a/src/engine/bank3.asm +++ b/src/engine/bank3.asm @@ -3,8 +3,8 @@ LoadMap: ; c000 (3:4000) call EnableSRAM bank1call Func_6785 call DisableSRAM - ld a, GAME_EVENT_CONTINUE_FROM_DIARY_OR_NEW_GAME - ld [wGameEventIndex], a + ld a, GAME_EVENT_OVERWORLD + ld [wGameEvent], a xor a ld [wd10f], a ld [wd110], a @@ -1766,7 +1766,7 @@ asm_cd2f pop af farcall Func_118a7 ld a, GAME_EVENT_DUEL - ld [wGameEventIndex], a + ld [wGameEvent], a ld hl, wd0b4 set 6, [hl] jp IncreaseOWScriptPointerBy4 @@ -1795,7 +1795,7 @@ Func_cd66: ; cd66 (3:4d66) Func_cd76: ; cd76 (3:4d76) ld a, GAME_EVENT_BATTLE_CENTER - ld [wGameEventIndex], a + ld [wGameEvent], a ld hl, wd0b4 set 6, [hl] jp IncreaseOWScriptPointerBy1 @@ -2708,7 +2708,7 @@ Func_d39d: ; d39d (3:539d) .asm_d3ac ld a, GAME_EVENT_GIFT_CENTER - ld [wGameEventIndex], a + ld [wGameEvent], a ld hl, wd0b4 set 6, [hl] @@ -2718,7 +2718,7 @@ Func_d39d: ; d39d (3:539d) Func_d3b9: ; d3b9 (3:53b9) call Func_3917 ld a, GAME_EVENT_CREDITS - ld [wGameEventIndex], a + ld [wGameEvent], a ld hl, wd0b4 set 6, [hl] jp IncreaseOWScriptPointerBy1 @@ -2795,7 +2795,7 @@ Func_d435: ; d435 (3:5435) Func_d43d: ; d43d (3:543d) ld a, GAME_EVENT_CHALLENGE_MACHINE - ld [wGameEventIndex], a + ld [wGameEvent], a ld hl, wd0b4 set 6, [hl] jp IncreaseOWScriptPointerBy1 diff --git a/src/engine/bank4.asm b/src/engine/bank4.asm index 35dee45..883065a 100644 --- a/src/engine/bank4.asm +++ b/src/engine/bank4.asm @@ -1125,8 +1125,8 @@ MainMenu_NewGame: ; 12704 (4:6704) ld [wd111], a call Func_39fc farcall Func_1d306 - ld a, GAME_EVENT_CONTINUE_FROM_DIARY_OR_NEW_GAME - ld [wGameEventIndex], a + ld a, GAME_EVENT_OVERWORLD + ld [wGameEvent], a farcall $03, ExecuteGameEvent or a ret @@ -1142,8 +1142,8 @@ MainMenu_ContinueFromDiary: ; 12741 (4:6741) xor a ld [$ba44], a call DisableSRAM - ld a, GAME_EVENT_CONTINUE_FROM_DIARY_OR_NEW_GAME - ld [wGameEventIndex], a + ld a, GAME_EVENT_OVERWORLD + ld [wGameEvent], a farcall $03, ExecuteGameEvent or a ret @@ -1166,7 +1166,7 @@ MainMenu_ContinueDuel: ; 1277e (4:677e) farcall $04, Func_3a40 farcall Func_70000 ld a, GAME_EVENT_CONTINUE_DUEL - ld [wGameEventIndex], a + ld [wGameEvent], a farcall $03, ExecuteGameEvent or a ret diff --git a/src/engine/home.asm b/src/engine/home.asm index cbe87bb..4c5ecfa 100644 --- a/src/engine/home.asm +++ b/src/engine/home.asm @@ -9067,8 +9067,8 @@ Func_380e: ; 380e (0:380e) call BankswitchHome ret -; enable the play time counter and execute the game event at [wGameEventIndex], -; then return to the overworld or restart the game. +; enable the play time counter and execute the game event at [wGameEvent]. +; then return to the overworld, or restart the game (only after Credits). ExecuteGameEvent: ; 383d (0:383d) ld a, $1 ld [wPlayTimeCounterEnable], a @@ -9084,9 +9084,9 @@ ExecuteGameEvent: ; 383d (0:383d) call BankswitchHome ret -; execute a game event at [wGameEventIndex] from GameEventPointerTable +; execute a game event at [wGameEvent] from GameEventPointerTable _ExecuteGameEvent: ; 3855 (0:3855) - ld a, [wGameEventIndex] + ld a, [wGameEvent] cp NUM_GAME_EVENTS jr c, .got_game_event ld a, GAME_EVENT_CHALLENGE_MACHINE @@ -9095,16 +9095,16 @@ _ExecuteGameEvent: ; 3855 (0:3855) jp JumpToFunctionInTable GameEventPointerTable: ; 3864 (0:3864) - dw GameEvent_ContinueFromDiaryOrNewGame - dw GameEvent_PracticeDuel + dw GameEvent_Overworld + dw GameEvent_Duel dw GameEvent_BattleCenter dw GameEvent_GiftCenter dw GameEvent_Credits dw GameEvent_ContinueDuel dw GameEvent_ChallengeMachine - dw GameEvent_ContinueFromDiaryOrNewGame + dw GameEvent_Overworld -GameEvent_ContinueFromDiaryOrNewGame: ; 3874 (0:3874) +GameEvent_Overworld: ; 3874 (0:3874) scf ret @@ -9144,7 +9144,7 @@ GameEvent_BattleCenter: ; 38a3 (0:38a3) scf ret -GameEvent_PracticeDuel: ; 38c0 (0:38c0) +GameEvent_Duel: ; 38c0 (0:38c0) ld a, $1 ld [wd0c2], a xor a diff --git a/src/wram.asm b/src/wram.asm index 6af5cb8..b100a57 100644 --- a/src/wram.asm +++ b/src/wram.asm @@ -1154,7 +1154,7 @@ wd0aa:: ; d0aa wd0b4:: ; d0b4 ds $1 -wGameEventIndex:: ; d0b5 +wGameEvent:: ; d0b5 ds $1 wSCX:: ; d0b6 |