diff options
| author | dannye <33dannye@gmail.com> | 2023-11-20 00:33:27 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2023-11-20 20:23:27 -0600 |
| commit | 298e99d3776580585c3f434e5d93137ae431bdd3 (patch) | |
| tree | a808c4ffd0fd0f9bd28972bae5236e0d3345c8e5 /engine/menus | |
| parent | Add sound bits documentation for wOptions (#110) (diff) | |
| parent | Name 2 unnamed labels I missed in SeafoamIslandsB4F and PokemonMansion3F (#437) (diff) | |
| download | pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.tar.gz pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.tar.xz pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'engine/menus')
| -rw-r--r-- | engine/menus/link_menu.asm | 4 | ||||
| -rw-r--r-- | engine/menus/main_menu.asm | 9 | ||||
| -rw-r--r-- | engine/menus/save.asm | 2 |
3 files changed, 10 insertions, 5 deletions
diff --git a/engine/menus/link_menu.asm b/engine/menus/link_menu.asm index ada3941e..170d5d64 100644 --- a/engine/menus/link_menu.asm +++ b/engine/menus/link_menu.asm @@ -775,10 +775,10 @@ LinkMenu: ld c, 50 call DelayFrames ld hl, wd732 - res 1, [hl] + res BIT_DEBUG_MODE, [hl] ld a, [wDefaultMap] ld [wDestinationMap], a - callfar SpecialWarpIn + callfar PrepareForSpecialWarp ld c, 20 call DelayFrames xor a diff --git a/engine/menus/main_menu.asm b/engine/menus/main_menu.asm index ce0b12c5..ca837143 100644 --- a/engine/menus/main_menu.asm +++ b/engine/menus/main_menu.asm @@ -119,7 +119,7 @@ MainMenu: ld [wDestinationMap], a ld hl, wd732 set 2, [hl] ; fly warp or dungeon warp - call SpecialWarpIn + call PrepareForSpecialWarp jp SpecialEnterMap InitOptions: @@ -146,7 +146,12 @@ NotEnoughMemoryText: StartNewGame: ld hl, wd732 - res 1, [hl] + ; Ensure debug mode is not used when + ; starting a regular new game. + ; Debug mode persists in saved games for + ; both debug and non-debug builds, and is + ; only reset here by the main menu. + res BIT_DEBUG_MODE, [hl] ; fallthrough StartNewGameDebug: call OakSpeech diff --git a/engine/menus/save.asm b/engine/menus/save.asm index 359830d9..b7ad5d66 100644 --- a/engine/menus/save.asm +++ b/engine/menus/save.asm @@ -366,7 +366,7 @@ ChangeBox:: call GetBoxSRAMLocation ld de, wBoxDataStart call CopyBoxToOrFromSRAM ; copy new box from SRAM to WRAM - ld hl, wMapTextPtr + ld hl, wCurMapTextPtr ld de, wChangeBoxSavedMapTextPointer ld a, [hli] ld [de], a |