diff options
| author | entrpntr <entrpntr@gmail.com> | 2020-03-22 13:13:22 -0400 |
|---|---|---|
| committer | entrpntr <entrpntr@gmail.com> | 2020-03-22 13:13:22 -0400 |
| commit | 15890237493f06d266a3197357d42edf883355e2 (patch) | |
| tree | 25a49309b08838c4af45e7dcb31f32daf3d450dd /engine | |
| parent | e67786a7a26ae7531301e928870b204043fb8a6a (diff) | |
Clean up wram constants and bad address labels/comments.
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/menus/start_menu.asm | 8 | ||||
| -rwxr-xr-x | engine/overworld/player_movement.asm | 2 | ||||
| -rw-r--r-- | engine/pokemon/mon_menu.asm | 14 |
3 files changed, 12 insertions, 12 deletions
diff --git a/engine/menus/start_menu.asm b/engine/menus/start_menu.asm index 2e5cec79..fa574d07 100644 --- a/engine/menus/start_menu.asm +++ b/engine/menus/start_menu.asm @@ -433,10 +433,10 @@ StartMenu_Save: call BufferScreen farcall SaveMenu - jr nc, .asm_12919 + jr nc, .asm_12ce0 ld a, 0 ret -.asm_12919 +.asm_12ce0 ld a, 1 ret @@ -460,13 +460,13 @@ StartMenu_Status: StartMenu_Pokedex: ld a, [wPartyCount] and a - jr z, .asm_12949 + jr z, .asm_12de0 call FadeToMenu farcall Pokedex call CloseSubmenu -.asm_12949 +.asm_12de0 ld a, 0 ret diff --git a/engine/overworld/player_movement.asm b/engine/overworld/player_movement.asm index e05fbb9d..579ae6f9 100755 --- a/engine/overworld/player_movement.asm +++ b/engine/overworld/player_movement.asm @@ -33,7 +33,7 @@ Function1002d: ; 1002d (4:402d) jr z, .asm_10060 cp PLAYER_BIKE jr z, .asm_10044 - cp PLAYER_SLIP + cp PLAYER_SKATE jr z, .asm_10074 .asm_10044 call Function102cb diff --git a/engine/pokemon/mon_menu.asm b/engine/pokemon/mon_menu.asm index 71b86a8a..6cc65879 100644 --- a/engine/pokemon/mon_menu.asm +++ b/engine/pokemon/mon_menu.asm @@ -346,11 +346,11 @@ TakePartyItem: call GetPartyItemLocation ld a, [hl] and a - jr z, .asm_12c8c + jr z, .asm_13053 ld [wCurItem], a call ReceiveItemFromPokemon - jr nc, .asm_12c94 + jr nc, .asm_1305b farcall ItemIsMail call GetPartyItemLocation @@ -360,18 +360,18 @@ TakePartyItem: call GetItemName ld hl, PokemonTookItemText call MenuTextboxBackup - jr .asm_12c9a + jr .asm_13061 -.asm_12c8c +.asm_13053 ld hl, PokemonNotHoldingText call MenuTextboxBackup - jr .asm_12c9a + jr .asm_13061 -.asm_12c94 +.asm_1305b ld hl, ItemStorageFullText call MenuTextboxBackup -.asm_12c9a +.asm_13061 ret GiveTakeItemMenuData: |