diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/battle/move_effects/teleport.asm | 6 | ||||
| -rw-r--r-- | engine/battle_anims/anim_commands.asm | 2 | ||||
| -rw-r--r-- | engine/events/battle_tower/battle_tower.asm | 4 | ||||
| -rw-r--r-- | engine/gfx/crystal_layouts.asm | 6 | ||||
| -rw-r--r-- | engine/menus/main_menu.asm | 4 | ||||
| -rw-r--r-- | engine/pokemon/stats_screen.asm | 5 | ||||
| -rw-r--r-- | engine/rtc/rtc.asm | 2 |
7 files changed, 13 insertions, 16 deletions
diff --git a/engine/battle/move_effects/teleport.asm b/engine/battle/move_effects/teleport.asm index 1a6aeed41..ba470798a 100644 --- a/engine/battle/move_effects/teleport.asm +++ b/engine/battle/move_effects/teleport.asm @@ -66,10 +66,8 @@ BattleCommand_Teleport: srl b srl b cp b - ; This does the wrong thing. What was - ; probably intended was jr c, .failed - ; The way this is made makes enemy use - ; of Teleport always succeed if able + ; This should be jr c, .failed + ; As written, it makes enemy use of Teleport always succeed if able jr nc, .run_away .run_away call UpdateBattleMonInParty diff --git a/engine/battle_anims/anim_commands.asm b/engine/battle_anims/anim_commands.asm index 09cfbcec0..113e9df37 100644 --- a/engine/battle_anims/anim_commands.asm +++ b/engine/battle_anims/anim_commands.asm @@ -152,7 +152,7 @@ BattleAnimRestoreHuds: ldh a, [rSVBK] push af - ld a, BANK(wCurBattleMon) ; aka BANK(wTempMon) and BANK(wPartyMon1) and several others + ld a, BANK(wCurBattleMon) ; aka BANK(wTempMon), BANK(wPartyMon1), and several others ldh [rSVBK], a ld hl, UpdateBattleHuds diff --git a/engine/events/battle_tower/battle_tower.asm b/engine/events/battle_tower/battle_tower.asm index a851c76f8..3e3bbb57f 100644 --- a/engine/events/battle_tower/battle_tower.asm +++ b/engine/events/battle_tower/battle_tower.asm @@ -17,7 +17,7 @@ Function1700c4: call Function17042c - ld a, BANK(s5_be45) ; aka BANK(s5_be46) and BANK(s5_aa41) and BANK(s5_aa5d) + ld a, BANK(s5_be45) ; aka BANK(s5_be46), BANK(s5_aa41), and BANK(s5_aa5d) call GetSRAMBank ld a, 1 ld [s5_be45], a @@ -1212,7 +1212,7 @@ CheckMobileEventIndex: ; BattleTowerAction $0b something to do with GS Ball Function1708c8: ; BattleTowerAction $0c call UpdateTime - ld a, BANK(s5_aa8b) ; aka BANK(s5_aa8c) and BANK(s5_aa5d) and BANK(s5_aa48) and BANK(s5_aa47) + ld a, BANK(s5_aa8b) ; aka BANK(s5_aa8c), BANK(s5_aa5d), BANK(s5_aa48), and BANK(s5_aa47) call GetSRAMBank ld a, [wCurDay] ld [s5_aa8b], a diff --git a/engine/gfx/crystal_layouts.asm b/engine/gfx/crystal_layouts.asm index 4f424d7fc..a9b4e3ee8 100644 --- a/engine/gfx/crystal_layouts.asm +++ b/engine/gfx/crystal_layouts.asm @@ -222,7 +222,7 @@ MG_Mobile_Layout02: RGB 31, 31, 31 Function49742: - ld hl, .Palette_49757 + ld hl, .MobileBorderPalettes ld de, wBGPals1 ld bc, 8 palettes ld a, BANK(wBGPals1) @@ -230,8 +230,8 @@ Function49742: farcall ApplyPals ret -.Palette_49757: -INCLUDE "gfx/unknown/49757.pal" +.MobileBorderPalettes: +INCLUDE "gfx/trade/mobile_border.pal" _InitMG_Mobile_LinkTradePalMap: hlcoord 0, 0, wAttrmap diff --git a/engine/menus/main_menu.asm b/engine/menus/main_menu.asm index f02da0ce7..214028bce 100644 --- a/engine/menus/main_menu.asm +++ b/engine/menus/main_menu.asm @@ -1,5 +1,5 @@ -GFX_49c0c: -INCBIN "gfx/unknown/049c0c.2bpp" +MobileMenuGFX: +INCBIN "gfx/mobile/mobile_menu.2bpp" MainMenu: xor a diff --git a/engine/pokemon/stats_screen.asm b/engine/pokemon/stats_screen.asm index 3719f3ade..cb066317d 100644 --- a/engine/pokemon/stats_screen.asm +++ b/engine/pokemon/stats_screen.asm @@ -942,9 +942,8 @@ StatsScreen_LoadTextboxSpaceGFX: pop hl ret -Unreferenced_4e32a: -; A blank space tile? - ds 16 +Unreferenced_StatsScreenSpaceGFX: +INCBIN "gfx/font/space.2bpp" EggStatsScreen: xor a diff --git a/engine/rtc/rtc.asm b/engine/rtc/rtc.asm index 00098c0e5..e3007ee4e 100644 --- a/engine/rtc/rtc.asm +++ b/engine/rtc/rtc.asm @@ -136,7 +136,7 @@ Function140ae: .time_overflow farcall ClearDailyTimers farcall Function170923 - ld a, BANK(s5_aa8c) ; and BANK(s5_b2fa) + ld a, BANK(s5_aa8c) ; aka BANK(s5_b2fa) call GetSRAMBank ld a, [s5_aa8c] inc a |