diff --git a/data/collision_permissions.asm b/data/collision_permissions.asm index 867bacbb0..2307ec98a 100644 --- a/data/collision_permissions.asm +++ b/data/collision_permissions.asm @@ -1,7 +1,7 @@ NONTALKABLE EQUS "db" TALKABLE EQUS "db TALK +" -TileCollisionTable:: ; 4ce1f +TileCollisionTable:: ; entries correspond to COLL_* constants NONTALKABLE LANDTILE ; COLL_FLOOR NONTALKABLE LANDTILE ; COLL_01 @@ -259,4 +259,3 @@ TileCollisionTable:: ; 4ce1f NONTALKABLE LANDTILE ; fd NONTALKABLE LANDTILE ; fe NONTALKABLE WALLTILE ; COLL_FF -; 4cf1f diff --git a/engine/battle/move_effects/present.asm b/engine/battle/move_effects/present.asm index 2bbea8028..f0949558f 100644 --- a/engine/battle/move_effects/present.asm +++ b/engine/battle/move_effects/present.asm @@ -32,12 +32,12 @@ BattleCommand_Present: .next ld a, [hli] cp -1 - jr z, .heal_effect ; 378a4 $11 + jr z, .heal_effect cp b - jr nc, .got_power ; 378a7 $4 + jr nc, .got_power inc c inc hl - jr .next ; 378ab $f4 + jr .next .got_power ld a, c @@ -56,12 +56,12 @@ BattleCommand_Present: ld hl, AICheckPlayerMaxHP ld a, [hBattleTurn] and a - jr z, .got_hp_fn_pointer ; 378c9 $3 + jr z, .got_hp_fn_pointer ld hl, AICheckEnemyMaxHP .got_hp_fn_pointer ld a, BANK(AICheckPlayerMaxHP) rst FarCall - jr c, .already_fully_healed ; 378d1 $20 + jr c, .already_fully_healed ld hl, GetQuarterMaxHP call CallBattleCore @@ -73,12 +73,12 @@ BattleCommand_Present: call StdBattleTextBox call BattleCommand_SwitchTurn call UpdateOpponentInParty - jr .do_animation ; 378f1 $11 + jr .do_animation .already_fully_healed call BattleCommand_SwitchTurn call _CheckBattleScene - jr nc, .do_animation ; 378f9 $9 + jr nc, .do_animation call AnimateFailedMove ld hl, RefusedGiftText call StdBattleTextBox diff --git a/engine/gfx/crystal_layouts.asm b/engine/gfx/crystal_layouts.asm index bc7aa3292..b9686701c 100644 --- a/engine/gfx/crystal_layouts.asm +++ b/engine/gfx/crystal_layouts.asm @@ -1,4 +1,4 @@ -GetMysteryGift_MobileAdapterLayout: ; 4930f (mobile) +GetMysteryGift_MobileAdapterLayout: ld a, b cp SCGB_RAM jr nz, .not_ram diff --git a/engine/gfx/player_gfx.asm b/engine/gfx/player_gfx.asm index 04208905a..9954143a8 100644 --- a/engine/gfx/player_gfx.asm +++ b/engine/gfx/player_gfx.asm @@ -72,7 +72,7 @@ ShowPlayerNamingChoices: INCLUDE "data/player_names.asm" -GetPlayerNameArray: ; 88318 This Function is never called +Unreferenced_GetPlayerNameArray: ld hl, wPlayerName ld de, MalePlayerNameArray ld a, [wPlayerGender] diff --git a/engine/menus/naming_screen.asm b/engine/menus/naming_screen.asm index 9d633bb3f..f269e32ad 100644 --- a/engine/menus/naming_screen.asm +++ b/engine/menus/naming_screen.asm @@ -925,7 +925,7 @@ INCBIN "gfx/naming_screen/middle_line.1bpp" NamingScreenGFX_UnderLine: INCBIN "gfx/naming_screen/underline.1bpp" -_ComposeMailMessage: ; 11e75 (mail?) +_ComposeMailMessage: ld hl, wNamingScreenDestinationPointer ld [hl], e inc hl diff --git a/engine/overworld/map_object_action.asm b/engine/overworld/map_object_action.asm index 613e3b099..2c4834a3d 100644 --- a/engine/overworld/map_object_action.asm +++ b/engine/overworld/map_object_action.asm @@ -190,7 +190,7 @@ SetFacingShadow: ld [hl], FACING_SHADOW ret -SetFacingEmote: ; 4582 emote +SetFacingEmote: ld hl, OBJECT_FACING_STEP add hl, bc ld [hl], FACING_EMOTE diff --git a/engine/overworld/map_objects.asm b/engine/overworld/map_objects.asm index 0846f01b1..d0cfd8741 100644 --- a/engine/overworld/map_objects.asm +++ b/engine/overworld/map_objects.asm @@ -2159,7 +2159,8 @@ Function55e0:: jr nz, .loop ret -Function5602: ; 5602, called at battle start +Function5602: +; called at battle start call Function5645 ; clear sprites ld a, PLAYER call Function5629 ; respawn player diff --git a/engine/pokemon/bills_pc.asm b/engine/pokemon/bills_pc.asm index d2de035ae..c5904e9b0 100644 --- a/engine/pokemon/bills_pc.asm +++ b/engine/pokemon/bills_pc.asm @@ -226,20 +226,19 @@ BillsPCDepositFuncCancel: ld [wJumptableIndex], a ret -BillsPCDepositMenuHeader: ; 0xe253d (38:653d) +BillsPCDepositMenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 9, 4, SCREEN_WIDTH - 1, 13 dw .MenuData db 1 ; default option -.MenuData: ; 0xe2545 (38:6545) +.MenuData: db STATICMENU_CURSOR ; flags db 4 ; items db "DEPOSIT@" db "STATS@" db "RELEASE@" db "CANCEL@" -; 0xe2564 (38:6564) Unreferenced_BillsPCClearThreeBoxes: hlcoord 0, 0 @@ -405,7 +404,7 @@ BillsPC_Withdraw: ld l, a jp hl -.dw ; e2699 (38:6699) #mark +.dw dw .withdraw ; Withdraw dw .stats ; Stats dw .release ; Release diff --git a/engine/printer/printer_serial.asm b/engine/printer/printer_serial.asm index b7422cac4..e8f106ac4 100644 --- a/engine/printer/printer_serial.asm +++ b/engine/printer/printer_serial.asm @@ -27,7 +27,7 @@ PrinterJumptableIteration: ld l, a jp hl -.Jumptable: ; 84031 (21:4031) +.Jumptable: dw Print_InitPrinterHandshake ; 00 dw Printer_CheckConnectionStatus ; 01 dw Printer_WaitSerial ; 02 diff --git a/home/menu_window.asm b/home/menu_window.asm index c279b8c56..49536d5f0 100644 --- a/home/menu_window.asm +++ b/home/menu_window.asm @@ -41,14 +41,14 @@ RestoreTileBackup:: ld [hli], a dec de dec c - jr nz, .col ; 0x1c3b $fa + jr nz, .col pop hl ld bc, SCREEN_WIDTH add hl, bc pop bc dec b - jr nz, .row ; 0x1c44 $ef + jr nz, .row ret @@ -60,7 +60,7 @@ PopWindow:: ld [de], a inc de dec b - jr nz, .loop ; 0x1c50 $fa + jr nz, .loop ret GetMenuBoxDims:: diff --git a/home/scrolling_menu.asm b/home/scrolling_menu.asm index 1662f8113..cf8e02fa8 100644 --- a/home/scrolling_menu.asm +++ b/home/scrolling_menu.asm @@ -40,7 +40,7 @@ InitScrollingMenu:: pop bc jp TextBox -JoyTextDelay_ForcehJoyDown:: ; 354b joypad +JoyTextDelay_ForcehJoyDown:: call DelayFrame ld a, [hInMenu] diff --git a/mobile/mobile_22.asm b/mobile/mobile_22.asm index f556a6291..54d79efe0 100644 --- a/mobile/mobile_22.asm +++ b/mobile/mobile_22.asm @@ -1035,7 +1035,7 @@ ClearScreenArea: ld a, $18 ld [hli], a dec c - jr nz, .asm_89713 ; 0x8971c $f5 + jr nz, .asm_89713 ret Function8971f: diff --git a/mobile/mobile_41.asm b/mobile/mobile_41.asm index 98dfe5ebd..b96a145ad 100644 --- a/mobile/mobile_41.asm +++ b/mobile/mobile_41.asm @@ -810,7 +810,8 @@ Mobile_AlwaysReturnNotCarry: or a ret -Function106331: ; 106331 - called by Mobile_DummyReturnFalse in Crystal-J +Function106331: +; called by Mobile_DummyReturnFalse in Crystal-J ; check ~[4:b000] == [7:a800] ld a, $4 call GetSRAMBank diff --git a/mobile/mobile_46.asm b/mobile/mobile_46.asm index 534835ac2..1f7ab27d0 100644 --- a/mobile/mobile_46.asm +++ b/mobile/mobile_46.asm @@ -5130,7 +5130,7 @@ String_11a7ac: db "データよみこみを" next "ちゅうし　しますか？@" -String_11a7c1: ; 11a7c1 ; new news? +String_11a7c1: db "あたらしい　ニュースは" next "ありません　でした@" diff --git a/mobile/mobile_5f.asm b/mobile/mobile_5f.asm index 13cb091da..675dfebc4 100644 --- a/mobile/mobile_5f.asm +++ b/mobile/mobile_5f.asm @@ -5076,7 +5076,7 @@ String_17fe63: next "せつめいしょを　ごらんください" db "@" -String_17fe9a: ; 17fe9a ; unused +String_17fe9a: ; unused db "ポケモンニュースが" next "あたらしくなっているので" next "レポートを　おくれません" diff --git a/sram.asm b/sram.asm index 6e8ed950e..2cd457e61 100644 --- a/sram.asm +++ b/sram.asm @@ -208,7 +208,7 @@ sBattleTowerSaveFileFlags:: db sBattleTowerReward:: db ; team of previous trainer -sBTMonOfTrainers:: ; 0xbe51 +sBTMonOfTrainers:: ; be51 sBTMonPrevTrainer1:: db sBTMonPrevTrainer2:: db sBTMonPrevTrainer3:: db