summaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
Diffstat (limited to 'engine')
-rw-r--r--engine/battle/ai/items.asm6
-rw-r--r--engine/battle/ai/scoring.asm4
-rw-r--r--engine/battle/core.asm8
-rw-r--r--engine/battle/move_effects/metronome.asm4
-rw-r--r--engine/battle/move_effects/protect.asm4
-rw-r--r--engine/battle/move_effects/spikes.asm4
-rw-r--r--engine/events/mom.asm8
-rw-r--r--engine/gfx/load_pics.asm2
-rw-r--r--engine/items/switch_items.asm22
-rw-r--r--engine/items/tmhm.asm4
-rw-r--r--engine/link/link.asm70
-rw-r--r--engine/menus/menu_2.asm10
-rw-r--r--engine/menus/scrolling_menu.asm4
-rw-r--r--engine/pokemon/mail_2.asm2
-rw-r--r--engine/rtc/rtc.asm2
15 files changed, 77 insertions, 77 deletions
diff --git a/engine/battle/ai/items.asm b/engine/battle/ai/items.asm
index 9c9572c7..bf65c683 100644
--- a/engine/battle/ai/items.asm
+++ b/engine/battle/ai/items.asm
@@ -385,7 +385,7 @@ AI_Items:
call EnemyUsedPotion
jp .Use
-.asm_382ae ; This appears to be unused
+.asm_3829f ; This appears to be unused
callfar AICheckEnemyMaxHP
jr c, .dont_use
push bc
@@ -700,7 +700,7 @@ EnemyWithdrewText:
text_far _EnemyWithdrewText
text_end
-Function384d5: ; This appears to be unused
+Function384c7: ; This appears to be unused
call AIUsedItemSound
call AI_HealStatus
ld a, FULL_HEAL_RED ; X_SPEED
@@ -747,7 +747,7 @@ EnemyUsedDireHit:
ld a, DIRE_HIT
jp PrintText_UsedItemOn_AND_AIUpdateHUD
-Function3851e: ; This appears to be unused
+Function38510: ; This appears to be unused
ldh [hDivisor], a
ld hl, wEnemyMonMaxHP
ld a, [hli]
diff --git a/engine/battle/ai/scoring.asm b/engine/battle/ai/scoring.asm
index 9a16b224..2ff0c2da 100644
--- a/engine/battle/ai/scoring.asm
+++ b/engine/battle/ai/scoring.asm
@@ -278,7 +278,7 @@ AI_Smart:
call AIGetEnemyMove
ld a, [wEnemyMoveStruct + MOVE_EFFECT]
- ld hl, .table_386f2
+ ld hl, .table_386e4
ld de, 3
call IsInArray
@@ -305,7 +305,7 @@ AI_Smart:
inc hl
jr .checkmove
-.table_386f2
+.table_386e4
dbw EFFECT_SLEEP, AI_Smart_Sleep
dbw EFFECT_LEECH_HIT, AI_Smart_LeechHit
dbw EFFECT_SELFDESTRUCT, AI_Smart_Selfdestruct
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index 3814348d..07d486b3 100644
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -1910,14 +1910,14 @@ RestoreHP:
ld b, a
ld a, [hl]
sbc b
- jr c, .asm_3cd2d
+ jr c, .asm_3ccd5
ld a, b
ld [hli], a
ld [wBuffer6], a
ld a, c
ld [hl], a
ld [wBuffer5], a
-.asm_3cd2d
+.asm_3ccd5
call SwitchTurnCore
call UpdateHPBarBattleHuds
@@ -5133,7 +5133,7 @@ MoveSelectionScreen:
dec a
jr nz, .interpret_joypad
hlcoord 11, 14
- ld de, .string_3e61c
+ ld de, .string_3e448
call PlaceString
jr .interpret_joypad
@@ -5229,7 +5229,7 @@ MoveSelectionScreen:
call SafeLoadTempTilemapToTilemap
jp MoveSelectionScreen
-.string_3e61c
+.string_3e448
db "@"
.pressed_up
diff --git a/engine/battle/move_effects/metronome.asm b/engine/battle/move_effects/metronome.asm
index 25197d7c..02766c16 100644
--- a/engine/battle/move_effects/metronome.asm
+++ b/engine/battle/move_effects/metronome.asm
@@ -3,7 +3,7 @@ BattleCommand_Metronome:
call ClearLastMove
call CheckUserIsCharging
- jr nz, .asm_3742b
+ jr nz, .asm_3752a
ld a, [wKickCounter]
push af
@@ -11,7 +11,7 @@ BattleCommand_Metronome:
pop af
ld [wKickCounter], a
-.asm_3742b
+.asm_3752a
call LoadMoveAnim
.GetMove:
diff --git a/engine/battle/move_effects/protect.asm b/engine/battle/move_effects/protect.asm
index e66bce44..9f3899a9 100644
--- a/engine/battle/move_effects/protect.asm
+++ b/engine/battle/move_effects/protect.asm
@@ -16,9 +16,9 @@ ProtectChance:
ld de, wPlayerProtectCount
ldh a, [hBattleTurn]
and a
- jr z, .asm_37637
+ jr z, .asm_37736
ld de, wEnemyProtectCount
-.asm_37637
+.asm_37736
call CheckOpponentWentFirst
jr nz, .failed
diff --git a/engine/battle/move_effects/spikes.asm b/engine/battle/move_effects/spikes.asm
index 96163a68..06aa35e8 100644
--- a/engine/battle/move_effects/spikes.asm
+++ b/engine/battle/move_effects/spikes.asm
@@ -4,9 +4,9 @@ BattleCommand_Spikes:
ld hl, wEnemyScreens
ldh a, [hBattleTurn]
and a
- jr z, .asm_3768e
+ jr z, .asm_3778d
ld hl, wPlayerScreens
-.asm_3768e
+.asm_3778d
; Fails if spikes are already down!
diff --git a/engine/events/mom.asm b/engine/events/mom.asm
index f97bd852..c1374fa6 100644
--- a/engine/events/mom.asm
+++ b/engine/events/mom.asm
@@ -98,7 +98,7 @@ BankOfMom:
ld hl, MomBankWhatDoYouWantToDoText
call PrintText
call LoadStandardMenuHeader
- ld hl, MenuHeader_0x166b5
+ ld hl, MenuHeader_0x16914
call CopyMenuHeader
call VerticalMenu
call CloseWindow
@@ -661,13 +661,13 @@ Mom_DepositString:
Mom_HeldString:
db "HELD@"
-MenuHeader_0x166b5:
+MenuHeader_0x16914:
db MENU_BACKUP_TILES ; flags
menu_coords 0, 0, 10, 10
- dw MenuData_0x166bd
+ dw MenuData_0x1691c
db 1 ; default option
-MenuData_0x166bd:
+MenuData_0x1691c:
db STATICMENU_CURSOR ; flags
db 4 ; items
db "GET@"
diff --git a/engine/gfx/load_pics.asm b/engine/gfx/load_pics.asm
index 187350e7..a4d88111 100644
--- a/engine/gfx/load_pics.asm
+++ b/engine/gfx/load_pics.asm
@@ -217,7 +217,7 @@ FixPicBank:
db $1f, $2e
db -1
-Function150ff:
+Function1587f:
ld a, c
push de
ld hl, PokemonPicPointers
diff --git a/engine/items/switch_items.asm b/engine/items/switch_items.asm
index 283823e4..cb1554d7 100644
--- a/engine/items/switch_items.asm
+++ b/engine/items/switch_items.asm
@@ -93,20 +93,20 @@ Function248cf:
call ItemSwitch_GetNthItem
ld a, [de]
cp [hl]
- jr nz, .asm_249cd
+ jr nz, .asm_248f5
ld a, [wScrollingMenuCursorPosition]
call Function249bf
cp 99
- jr z, .asm_249cd
+ jr z, .asm_248f5
ld a, [wSwitchItem]
call Function249bf
cp 99
- jr nz, .asm_249cf
-.asm_249cd
+ jr nz, .asm_248f7
+.asm_248f5
and a
ret
-.asm_249cf
+.asm_248f7
scf
ret
@@ -122,7 +122,7 @@ Function248f9:
pop hl
add [hl]
cp 100
- jr c, .asm_24a01
+ jr c, .asm_24929
sub 99
push af
ld a, [wScrollingMenuCursorPosition]
@@ -138,7 +138,7 @@ Function248f9:
ld [wSwitchItem], a
ret
-.asm_24a01
+.asm_24929
push af
ld a, [wScrollingMenuCursorPosition]
call ItemSwitch_GetNthItem
@@ -151,7 +151,7 @@ Function248f9:
ld l, a
ld a, [wSwitchItem]
cp [hl]
- jr nz, .asm_24a25
+ jr nz, .asm_2494d
dec [hl]
ld a, [wSwitchItem]
call ItemSwitch_GetNthItem
@@ -160,7 +160,7 @@ Function248f9:
ld [wSwitchItem], a
ret
-.asm_24a25
+.asm_2494d
dec [hl]
call ItemSwitch_ConvertItemFormatToDW
push bc
@@ -170,12 +170,12 @@ Function248f9:
push hl
add hl, bc
pop de
-.asm_24a34
+.asm_2495c
ld a, [hli]
ld [de], a
inc de
cp $ff
- jr nz, .asm_24a34
+ jr nz, .asm_2495c
xor a
ld [wSwitchItem], a
ret
diff --git a/engine/items/tmhm.asm b/engine/items/tmhm.asm
index 4095be03..1849d23c 100644
--- a/engine/items/tmhm.asm
+++ b/engine/items/tmhm.asm
@@ -435,7 +435,7 @@ TMHMPocket_GetCurrentLineCoord:
jr nz, .loop
ret
-Unreferenced_Function2ca95:
+Unreferenced_Function2c89a:
pop hl
ld bc, 3
add hl, bc
@@ -483,7 +483,7 @@ TMHM_PlaySFX_ReadText2:
pop de
ret
-Unreferenced_Function2cadf:
+Unreferenced_Function2c8e4:
call ConvertCurItemIntoCurTMHM
call .CheckHaveRoomForTMHM
ld hl, .NoRoomTMHMText
diff --git a/engine/link/link.asm b/engine/link/link.asm
index fccb8f5c..5f88a087 100644
--- a/engine/link/link.asm
+++ b/engine/link/link.asm
@@ -99,9 +99,9 @@ Gen2ToGen1LinkComms:
ld a, [hl]
pop hl
and a
- jp z, Function28b22
+ jp z, Function28a04
cp $7
- jp nc, Function28b22
+ jp nc, Function28a04
ld de, wLinkData
ld bc, $1a2
call Link_CopyOTData
@@ -161,7 +161,7 @@ Gen2ToGen1LinkComms:
.done_party
ld [de], a
ld hl, wTimeCapsulePartyMon1Species
- call Function2868a
+ call Function285db
ld a, LOW(wOTPartyMonOT)
ld [wUnusedCFFE], a
ld a, HIGH(wOTPartyMonOT)
@@ -180,7 +180,7 @@ Gen2ToGen2LinkComms:
call ClearLinkData
call Link_PrepPartyData_Gen2
call FixDataForLinkTransfer
- call Function29dba
+ call Function29bf4
ld a, [wScriptVar]
and a
jp z, LinkTimeout
@@ -418,7 +418,7 @@ Gen2ToGen2LinkComms:
pop af
ld [wOptions], a
farcall LoadPokemonData
- jp Function28b22
+ jp Function28a04
.ready_to_trade
ld de, MUSIC_ROUTE_30
@@ -772,7 +772,7 @@ Link_PrepPartyData_Gen2:
; Fill 5 bytes at wc8f4 with $20
ld de, wc8f4
ld a, $20
- call Function28682
+ call Function285d3
; Copy all the mail messages to wc9f9
ld a, BANK(sPartyMail)
@@ -838,7 +838,7 @@ Link_PrepPartyData_Gen2:
ld [de], a
ret
-Function28682:
+Function285d3:
ld c, 5
.loop
ld [de], a
@@ -847,7 +847,7 @@ Function28682:
jr nz, .loop
ret
-Function2868a:
+Function285db:
push hl
ld d, h
ld e, l
@@ -1144,7 +1144,7 @@ LinkTradeOTPartymonMenuLoop:
.not_d_up
bit D_DOWN_F, a
jp z, LinkTradePartiesMenuMasterLoop
- jp Function28ac9
+ jp Function289c2
LinkTrade_PlayerPartyMenu:
xor a
@@ -1177,7 +1177,7 @@ LinkTradePartymonMenuLoop:
.check_joypad
bit A_BUTTON_F, a
jr z, .not_a_button
- jp Function28926
+ jp Function2884a
.not_a_button
bit D_DOWN_F, a
@@ -1211,7 +1211,7 @@ LinkTradePartiesMenuMasterLoop:
jp z, LinkTradePartymonMenuLoop ; PARTYMON
jp LinkTradeOTPartymonMenuLoop ; OTPARTYMON
-Function28926:
+Function2884a:
call HideCursor
call LoadTilemapToTempTilemap
call PlaceHollowCursor
@@ -1372,12 +1372,12 @@ Function28926:
text_far _LinkAbnormalMonText
text_end
-Function28ac9:
+Function289c2:
ld a, [wMenuCursorY]
cp 1
jp nz, LinkTradePartiesMenuMasterLoop
call HideCursor
-Function28ade:
+Function289cd:
.loop1
ld a, "▶"
ldcoord_a 1, 16
@@ -1405,7 +1405,7 @@ Function28ade:
ld a, [wOtherPlayerLinkMode]
cp $f
jr nz, .loop1
-Function28b22:
+Function28a04:
xor a
ld [wd8b7], a
xor a
@@ -1495,7 +1495,7 @@ LinkTrade:
ld b, 3
ld c, 7
call LinkTextboxAtHL
- ld de, String28eab
+ ld de, String28d44
hlcoord 12, 8
call PlaceString
ld a, 8
@@ -1521,12 +1521,12 @@ LinkTrade:
call SafeLoadTempTilemapToTilemap
pop af
bit 1, a
- jr nz, .asm_28c33
+ jr nz, .asm_28b16
ld a, [wMenuCursorY]
dec a
- jr z, .asm_28c54
+ jr z, .asm_28b34
-.asm_28c33
+.asm_28b16
ld a, $1
ld [wPlayerLinkAction], a
hlcoord 0, 12
@@ -1537,15 +1537,15 @@ LinkTrade:
ld de, String_TooBadTheTradeWasCanceled
call PlaceString
call Serial_PrintWaitingTextAndSyncAndExchangeNybble
- jp Function28ea3
+ jp Function28d3c
-.asm_28c54
+.asm_28b34
ld a, $2
ld [wPlayerLinkAction], a
call Serial_PrintWaitingTextAndSyncAndExchangeNybble
ld a, [wOtherPlayerLinkMode]
dec a
- jr nz, .asm_28c7b
+ jr nz, .asm_28b58
hlcoord 0, 12
ld b, 4
ld c, 18
@@ -1553,9 +1553,9 @@ LinkTrade:
hlcoord 1, 14
ld de, String_TooBadTheTradeWasCanceled
call PlaceString
- jp Function28ea3
+ jp Function28d3c
-.asm_28c7b
+.asm_28b58
ld hl, sPartyMail
ld a, [wceed]
ld bc, MAIL_STRUCT_LENGTH
@@ -1568,18 +1568,18 @@ LinkTrade:
add hl, bc
ld a, [wceed]
ld c, a
-.asm_28c96
+.asm_28b73
inc c
ld a, c
cp PARTY_LENGTH
- jr z, .asm_28ca6
+ jr z, .asm_28b83
push bc
ld bc, MAIL_STRUCT_LENGTH
call CopyBytes
pop bc
- jr .asm_28c96
+ jr .asm_28b73
-.asm_28ca6
+.asm_28b83
ld hl, sPartyMail
ld a, [wPartyCount]
dec a
@@ -1761,7 +1761,7 @@ LinkTrade:
ld c, 18
call LinkTextboxAtHL
hlcoord 1, 14
- ld de, String28ebd
+ ld de, String28d56
call PlaceString
ld c, 50
call DelayFrames
@@ -1770,12 +1770,12 @@ LinkTrade:
jp z, Gen2ToGen1LinkComms
jp Gen2ToGen2LinkComms
-Function28ea3:
+Function28d3c:
ld c, 100
call DelayFrames
jp InitTradeMenuDisplay
-String28eab:
+String28d44:
db "TRADE"
next "CANCEL@"
@@ -1783,7 +1783,7 @@ LinkAskTradeForText:
text_far _LinkAskTradeForText
text_end
-String28ebd:
+String28d56:
db "Trade completed!@"
String_TooBadTheTradeWasCanceled:
@@ -1923,19 +1923,19 @@ CheckTimeCapsuleCompatibility:
call GetMoveName
call CopyName1
pop bc
- call Function29c67
+ call Function29ab3
ld a, $2
jr .done
.mon_has_mail
- call Function29c67
+ call Function29ab3
ld a, $3
.done
ld [wScriptVar], a
ret
-Function29c67:
+Function29ab3:
ld a, [wPartyCount]
sub b
ld c, a
@@ -2116,7 +2116,7 @@ CheckLinkTimeout:
ret nz
jp Link_ResetSerialRegistersAfterLinkClosure
-Function29dba:
+Function29bf4:
ld a, $5
ld [wPlayerLinkAction], a
ld hl, wLinkTimeoutFrames
diff --git a/engine/menus/menu_2.asm b/engine/menus/menu_2.asm
index 50214545..2fd65e2b 100644
--- a/engine/menus/menu_2.asm
+++ b/engine/menus/menu_2.asm
@@ -28,17 +28,17 @@ PlaceMenuItemQuantity:
ret
PlaceMoneyTopRight:
- ld hl, MenuHeader_0x24b15
+ ld hl, MenuHeader_0x24a3d
call CopyMenuHeader
jr PlaceMoneyTextbox
PlaceMoneyBottomLeft:
- ld hl, MenuHeader_0x24b1d
+ ld hl, MenuHeader_0x24a45
call CopyMenuHeader
jr PlaceMoneyTextbox
PlaceMoneyAtTopLeftOfTextbox:
- ld hl, MenuHeader_0x24b15
+ ld hl, MenuHeader_0x24a3d
lb de, 0, 11
call OffsetMenuHeader
@@ -52,13 +52,13 @@ PlaceMoneyTextbox:
call PrintNum
ret
-MenuHeader_0x24b15:
+MenuHeader_0x24a3d:
db MENU_BACKUP_TILES ; flags
menu_coords 11, 0, SCREEN_WIDTH - 1, 2
dw NULL
db 1 ; default option
-MenuHeader_0x24b1d:
+MenuHeader_0x24a45:
db MENU_BACKUP_TILES ; flags
menu_coords 0, 11, 8, 13
dw NULL
diff --git a/engine/menus/scrolling_menu.asm b/engine/menus/scrolling_menu.asm
index 6b0572a6..f051e71c 100644
--- a/engine/menus/scrolling_menu.asm
+++ b/engine/menus/scrolling_menu.asm
@@ -401,11 +401,11 @@ ScrollingMenu_UpdateDisplay:
ld a, [wMenuDataFlags]
bit 0, a ; call function on cancel
jr nz, .call_function
- ld de, .string_2485f
+ ld de, .string_24787
call PlaceString
ret
-.string_2485f
+.string_24787
db "CANCEL@"
.call_function
diff --git a/engine/pokemon/mail_2.asm b/engine/pokemon/mail_2.asm
index 8e808948..f7cfe5c7 100644
--- a/engine/pokemon/mail_2.asm
+++ b/engine/pokemon/mail_2.asm
@@ -690,7 +690,7 @@ MailGFX_PlaceMessage:
.place_author
jp PlaceString
-Unreferenced_Functionb984e:
+Unreferenced_Functionbb4c5:
.loop
ld a, [hl]
xor $ff
diff --git a/engine/rtc/rtc.asm b/engine/rtc/rtc.asm
index 440e717f..e56bed45 100644
--- a/engine/rtc/rtc.asm
+++ b/engine/rtc/rtc.asm
@@ -54,7 +54,7 @@ TimesOfDay:
db MAX_HOUR, NITE_F
db -1, MORN_F
-Unreferenced_14044:
+Unreferenced_1404e:
db 20, NITE_F
db 40, MORN_F
db 60, DAY_F
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-26 22:39:25 +0000