summaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2018-06-24 21:39:23 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2018-06-24 21:39:23 -0400
commit9afaed9b8fb93b6413d901f533f51a5298fb43dc (patch)
tree70837e3d702a375914a78ace5dd9389f01510431 /engine
parentc7032617aa1df7aa44167551e4571a9557fe9539 (diff)
Remove more address comments
Diffstat (limited to 'engine')
-rw-r--r--engine/battle/move_effects/present.asm14
-rw-r--r--engine/gfx/crystal_layouts.asm2
-rw-r--r--engine/gfx/player_gfx.asm2
-rw-r--r--engine/menus/naming_screen.asm2
-rw-r--r--engine/overworld/map_object_action.asm2
-rw-r--r--engine/overworld/map_objects.asm3
-rw-r--r--engine/pokemon/bills_pc.asm7
-rw-r--r--engine/printer/printer_serial.asm2
8 files changed, 17 insertions, 17 deletions
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