Remove more address comments

This commit is contained in:
Rangi 2018-06-24 21:39:23 -04:00
parent c7032617aa
commit 9afaed9b8f
16 changed files with 28 additions and 28 deletions

View File

@ -1,7 +1,7 @@
NONTALKABLE EQUS "db" NONTALKABLE EQUS "db"
TALKABLE EQUS "db TALK +" TALKABLE EQUS "db TALK +"
TileCollisionTable:: ; 4ce1f TileCollisionTable::
; entries correspond to COLL_* constants ; entries correspond to COLL_* constants
NONTALKABLE LANDTILE ; COLL_FLOOR NONTALKABLE LANDTILE ; COLL_FLOOR
NONTALKABLE LANDTILE ; COLL_01 NONTALKABLE LANDTILE ; COLL_01
@ -259,4 +259,3 @@ TileCollisionTable:: ; 4ce1f
NONTALKABLE LANDTILE ; fd NONTALKABLE LANDTILE ; fd
NONTALKABLE LANDTILE ; fe NONTALKABLE LANDTILE ; fe
NONTALKABLE WALLTILE ; COLL_FF NONTALKABLE WALLTILE ; COLL_FF
; 4cf1f

View File

@ -32,12 +32,12 @@ BattleCommand_Present:
.next .next
ld a, [hli] ld a, [hli]
cp -1 cp -1
jr z, .heal_effect ; 378a4 $11 jr z, .heal_effect
cp b cp b
jr nc, .got_power ; 378a7 $4 jr nc, .got_power
inc c inc c
inc hl inc hl
jr .next ; 378ab $f4 jr .next
.got_power .got_power
ld a, c ld a, c
@ -56,12 +56,12 @@ BattleCommand_Present:
ld hl, AICheckPlayerMaxHP ld hl, AICheckPlayerMaxHP
ld a, [hBattleTurn] ld a, [hBattleTurn]
and a and a
jr z, .got_hp_fn_pointer ; 378c9 $3 jr z, .got_hp_fn_pointer
ld hl, AICheckEnemyMaxHP ld hl, AICheckEnemyMaxHP
.got_hp_fn_pointer .got_hp_fn_pointer
ld a, BANK(AICheckPlayerMaxHP) ld a, BANK(AICheckPlayerMaxHP)
rst FarCall rst FarCall
jr c, .already_fully_healed ; 378d1 $20 jr c, .already_fully_healed
ld hl, GetQuarterMaxHP ld hl, GetQuarterMaxHP
call CallBattleCore call CallBattleCore
@ -73,12 +73,12 @@ BattleCommand_Present:
call StdBattleTextBox call StdBattleTextBox
call BattleCommand_SwitchTurn call BattleCommand_SwitchTurn
call UpdateOpponentInParty call UpdateOpponentInParty
jr .do_animation ; 378f1 $11 jr .do_animation
.already_fully_healed .already_fully_healed
call BattleCommand_SwitchTurn call BattleCommand_SwitchTurn
call _CheckBattleScene call _CheckBattleScene
jr nc, .do_animation ; 378f9 $9 jr nc, .do_animation
call AnimateFailedMove call AnimateFailedMove
ld hl, RefusedGiftText ld hl, RefusedGiftText
call StdBattleTextBox call StdBattleTextBox

View File

@ -1,4 +1,4 @@
GetMysteryGift_MobileAdapterLayout: ; 4930f (mobile) GetMysteryGift_MobileAdapterLayout:
ld a, b ld a, b
cp SCGB_RAM cp SCGB_RAM
jr nz, .not_ram jr nz, .not_ram

View File

@ -72,7 +72,7 @@ ShowPlayerNamingChoices:
INCLUDE "data/player_names.asm" INCLUDE "data/player_names.asm"
GetPlayerNameArray: ; 88318 This Function is never called Unreferenced_GetPlayerNameArray:
ld hl, wPlayerName ld hl, wPlayerName
ld de, MalePlayerNameArray ld de, MalePlayerNameArray
ld a, [wPlayerGender] ld a, [wPlayerGender]

View File

@ -925,7 +925,7 @@ INCBIN "gfx/naming_screen/middle_line.1bpp"
NamingScreenGFX_UnderLine: NamingScreenGFX_UnderLine:
INCBIN "gfx/naming_screen/underline.1bpp" INCBIN "gfx/naming_screen/underline.1bpp"
_ComposeMailMessage: ; 11e75 (mail?) _ComposeMailMessage:
ld hl, wNamingScreenDestinationPointer ld hl, wNamingScreenDestinationPointer
ld [hl], e ld [hl], e
inc hl inc hl

View File

@ -190,7 +190,7 @@ SetFacingShadow:
ld [hl], FACING_SHADOW ld [hl], FACING_SHADOW
ret ret
SetFacingEmote: ; 4582 emote SetFacingEmote:
ld hl, OBJECT_FACING_STEP ld hl, OBJECT_FACING_STEP
add hl, bc add hl, bc
ld [hl], FACING_EMOTE ld [hl], FACING_EMOTE

View File

@ -2159,7 +2159,8 @@ Function55e0::
jr nz, .loop jr nz, .loop
ret ret
Function5602: ; 5602, called at battle start Function5602:
; called at battle start
call Function5645 ; clear sprites call Function5645 ; clear sprites
ld a, PLAYER ld a, PLAYER
call Function5629 ; respawn player call Function5629 ; respawn player

View File

@ -226,20 +226,19 @@ BillsPCDepositFuncCancel:
ld [wJumptableIndex], a ld [wJumptableIndex], a
ret ret
BillsPCDepositMenuHeader: ; 0xe253d (38:653d) BillsPCDepositMenuHeader:
db MENU_BACKUP_TILES ; flags db MENU_BACKUP_TILES ; flags
menu_coords 9, 4, SCREEN_WIDTH - 1, 13 menu_coords 9, 4, SCREEN_WIDTH - 1, 13
dw .MenuData dw .MenuData
db 1 ; default option db 1 ; default option
.MenuData: ; 0xe2545 (38:6545) .MenuData:
db STATICMENU_CURSOR ; flags db STATICMENU_CURSOR ; flags
db 4 ; items db 4 ; items
db "DEPOSIT@" db "DEPOSIT@"
db "STATS@" db "STATS@"
db "RELEASE@" db "RELEASE@"
db "CANCEL@" db "CANCEL@"
; 0xe2564 (38:6564)
Unreferenced_BillsPCClearThreeBoxes: Unreferenced_BillsPCClearThreeBoxes:
hlcoord 0, 0 hlcoord 0, 0
@ -405,7 +404,7 @@ BillsPC_Withdraw:
ld l, a ld l, a
jp hl jp hl
.dw ; e2699 (38:6699) #mark .dw
dw .withdraw ; Withdraw dw .withdraw ; Withdraw
dw .stats ; Stats dw .stats ; Stats
dw .release ; Release dw .release ; Release

View File

@ -27,7 +27,7 @@ PrinterJumptableIteration:
ld l, a ld l, a
jp hl jp hl
.Jumptable: ; 84031 (21:4031) .Jumptable:
dw Print_InitPrinterHandshake ; 00 dw Print_InitPrinterHandshake ; 00
dw Printer_CheckConnectionStatus ; 01 dw Printer_CheckConnectionStatus ; 01
dw Printer_WaitSerial ; 02 dw Printer_WaitSerial ; 02

View File

@ -41,14 +41,14 @@ RestoreTileBackup::
ld [hli], a ld [hli], a
dec de dec de
dec c dec c
jr nz, .col ; 0x1c3b $fa jr nz, .col
pop hl pop hl
ld bc, SCREEN_WIDTH ld bc, SCREEN_WIDTH
add hl, bc add hl, bc
pop bc pop bc
dec b dec b
jr nz, .row ; 0x1c44 $ef jr nz, .row
ret ret
@ -60,7 +60,7 @@ PopWindow::
ld [de], a ld [de], a
inc de inc de
dec b dec b
jr nz, .loop ; 0x1c50 $fa jr nz, .loop
ret ret
GetMenuBoxDims:: GetMenuBoxDims::

View File

@ -40,7 +40,7 @@ InitScrollingMenu::
pop bc pop bc
jp TextBox jp TextBox
JoyTextDelay_ForcehJoyDown:: ; 354b joypad JoyTextDelay_ForcehJoyDown::
call DelayFrame call DelayFrame
ld a, [hInMenu] ld a, [hInMenu]

View File

@ -1035,7 +1035,7 @@ ClearScreenArea:
ld a, $18 ld a, $18
ld [hli], a ld [hli], a
dec c dec c
jr nz, .asm_89713 ; 0x8971c $f5 jr nz, .asm_89713
ret ret
Function8971f: Function8971f:

View File

@ -810,7 +810,8 @@ Mobile_AlwaysReturnNotCarry:
or a or a
ret ret
Function106331: ; 106331 - called by Mobile_DummyReturnFalse in Crystal-J Function106331:
; called by Mobile_DummyReturnFalse in Crystal-J
; check ~[4:b000] == [7:a800] ; check ~[4:b000] == [7:a800]
ld a, $4 ld a, $4
call GetSRAMBank call GetSRAMBank

View File

@ -5130,7 +5130,7 @@ String_11a7ac:
db "データ<NO>よみこみを" db "データ<NO>よみこみを"
next "ちゅうし しますか?@" next "ちゅうし しますか?@"
String_11a7c1: ; 11a7c1 ; new news? String_11a7c1:
db "あたらしい ニュースは" db "あたらしい ニュースは"
next "ありません でした@" next "ありません でした@"

View File

@ -5076,7 +5076,7 @@ String_17fe63:
next "せつめいしょを ごらんください" next "せつめいしょを ごらんください"
db "@" db "@"
String_17fe9a: ; 17fe9a ; unused String_17fe9a: ; unused
db "ポケモンニュースが" db "ポケモンニュースが"
next "あたらしくなっているので" next "あたらしくなっているので"
next "レポートを おくれません" next "レポートを おくれません"

View File

@ -208,7 +208,7 @@ sBattleTowerSaveFileFlags:: db
sBattleTowerReward:: db sBattleTowerReward:: db
; team of previous trainer ; team of previous trainer
sBTMonOfTrainers:: ; 0xbe51 sBTMonOfTrainers:: ; be51
sBTMonPrevTrainer1:: db sBTMonPrevTrainer1:: db
sBTMonPrevTrainer2:: db sBTMonPrevTrainer2:: db
sBTMonPrevTrainer3:: db sBTMonPrevTrainer3:: db