summaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
Diffstat (limited to 'engine')
-rw-r--r--engine/battle/move_effects/present.asm14
-rw-r--r--engine/events/fish.asm2
-rw-r--r--engine/gfx/crystal_layouts.asm2
-rw-r--r--engine/gfx/player_gfx.asm2
-rw-r--r--engine/items/mart.asm40
-rw-r--r--engine/link/link_2.asm10
-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/overworld/wildmons.asm12
-rw-r--r--engine/pokemon/bills_pc.asm7
-rw-r--r--engine/printer/printer_serial.asm2
12 files changed, 54 insertions, 44 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/events/fish.asm b/engine/events/fish.asm
index ec3e9a727..9d695a908 100644
--- a/engine/events/fish.asm
+++ b/engine/events/fish.asm
@@ -11,7 +11,7 @@ Fish:
call GetFishGroupIndex
ld hl, FishGroups
-rept 7
+rept FISHGROUP_DATA_LENGTH
add hl, de
endr
call .Fish
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/items/mart.asm b/engine/items/mart.asm
index 53b94249b..a683a4b44 100644
--- a/engine/items/mart.asm
+++ b/engine/items/mart.asm
@@ -26,7 +26,7 @@ OpenMartDialog::
MartDialog:
ld a, 0
ld [wEngineBuffer1], a
- xor a
+ xor a ; STANDARDMART_HOWMAYIHELPYOU
ld [wEngineBuffer5], a
call StandardMart
ret
@@ -103,7 +103,7 @@ LoadMartPointer:
ld [wMartPointer + 1], a
ld hl, wCurMart
xor a
- ld bc, 16
+ ld bc, wCurMartEnd - wCurMart
call ByteFill
xor a
ld [wEngineBuffer5], a
@@ -129,17 +129,27 @@ GetMart:
ld b, BANK(Marts)
ret
+; StandardMart.MartFunctions indexes
+ const_def
+ const STANDARDMART_HOWMAYIHELPYOU ; 0
+ const STANDARDMART_TOPMENU ; 1
+ const STANDARDMART_BUY ; 2
+ const STANDARDMART_SELL ; 3
+ const STANDARDMART_QUIT ; 4
+ const STANDARDMART_ANYTHINGELSE ; 5
+
StandardMart:
.loop
ld a, [wEngineBuffer5]
ld hl, .MartFunctions
rst JumpTable
ld [wEngineBuffer5], a
- cp $ff
+ cp -1
jr nz, .loop
ret
.MartFunctions:
+; entries correspond to STANDARDMART_* constants
dw .HowMayIHelpYou
dw .TopMenu
dw .Buy
@@ -151,7 +161,7 @@ StandardMart:
call LoadStandardMenuHeader
ld hl, Text_Mart_HowMayIHelpYou
call PrintText
- ld a, $1 ; top menu
+ ld a, STANDARDMART_TOPMENU
ret
.TopMenu:
@@ -165,13 +175,13 @@ StandardMart:
cp $2
jr z, .sell
.quit
- ld a, $4 ; Come again!
+ ld a, STANDARDMART_QUIT
ret
.buy
- ld a, $2 ; buy
+ ld a, STANDARDMART_BUY
ret
.sell
- ld a, $3 ; sell
+ ld a, STANDARDMART_SELL
ret
.Buy:
@@ -179,27 +189,27 @@ StandardMart:
call FarReadMart
call BuyMenu
and a
- ld a, $5 ; Anything else?
+ ld a, STANDARDMART_ANYTHINGELSE
ret
.Sell:
call ExitMenu
call SellMenu
- ld a, $5 ; Anything else?
+ ld a, STANDARDMART_ANYTHINGELSE
ret
.Quit:
call ExitMenu
ld hl, Text_Mart_ComeAgain
call MartTextBox
- ld a, $ff ; exit
+ ld a, -1
ret
.AnythingElse:
call LoadStandardMenuHeader
ld hl, Text_Mart_AnythingElse
call PrintText
- ld a, $1 ; top menu
+ ld a, STANDARDMART_TOPMENU
ret
FarReadMart:
@@ -444,7 +454,7 @@ BuyMenuLoop:
jr c, .cancel
ld de, wMoney
ld bc, hMoneyTemp
- ld a, $3 ; useless load
+ ld a, 3 ; useless load
call CompareMoney
jr c, .insufficient_funds
ld hl, wNumItems
@@ -452,7 +462,7 @@ BuyMenuLoop:
jr nc, .insufficient_bag_space
ld a, [wMartItemID]
ld e, a
- ld d, $0
+ ld d, 0
ld b, SET_FLAG
ld hl, wBargainShopFlags
call FlagAction
@@ -508,7 +518,7 @@ BargainShopAskPurchaseQuantity:
ld [wItemQuantityChangeBuffer], a
ld a, [wMartItemID]
ld e, a
- ld d, $0
+ ld d, 0
ld b, CHECK_FLAG
ld hl, wBargainShopFlags
call FlagAction
@@ -517,7 +527,7 @@ BargainShopAskPurchaseQuantity:
jr nz, .SoldOut
ld a, [wMartItemID]
ld e, a
- ld d, $0
+ ld d, 0
ld hl, wMartPointer
ld a, [hli]
ld h, [hl]
diff --git a/engine/link/link_2.asm b/engine/link/link_2.asm
index ed7a7e2c9..9406e43bb 100644
--- a/engine/link/link_2.asm
+++ b/engine/link/link_2.asm
@@ -66,22 +66,22 @@ LinkTextbox2:
add hl, de
.loop
push hl
- ld a, "┌"
+ ld a, $79
ld [hli], a
ld a, " "
call .PlaceRow
- ld [hl], "─"
+ ld [hl], $7a
pop hl
ld de, SCREEN_WIDTH
add hl, de
dec b
jr nz, .loop
- ld a, "┐"
+ ld a, $7b
ld [hli], a
- ld a, "│"
+ ld a, $7c
call .PlaceRow
- ld [hl], "└"
+ ld [hl], $7d
ret
.PlaceRow:
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/overworld/wildmons.asm b/engine/overworld/wildmons.asm
index eef618156..ae611d4ca 100644
--- a/engine/overworld/wildmons.asm
+++ b/engine/overworld/wildmons.asm
@@ -86,7 +86,7 @@ FindNest:
ld a, [hli]
ld c, a
inc hl
- ld a, 3
+ ld a, NUM_WATERMON
call .SearchMapForMon
jr nc, .next_water
ld [de], a
@@ -94,7 +94,7 @@ FindNest:
.next_water
pop hl
- ld bc, 3 * 3
+ ld bc, WATER_WILDDATA_LENGTH
add hl, bc
jr .FindWater
@@ -264,7 +264,7 @@ ChooseWildEncounter:
inc hl
inc hl
ld a, [wTimeOfDay]
- ld bc, $e
+ ld bc, NUM_GRASSMON * 2
call AddNTimes
ld de, GrassMonProbTable
@@ -655,7 +655,7 @@ UpdateRoamMons:
jr nc, .update_loop ; invalid index, try again
inc hl
ld c, a
- ld b, $0
+ ld b, 0
add hl, bc
add hl, bc
ld a, [wRoamMons_LastMapGroup]
@@ -796,7 +796,7 @@ RandomUnseenWildMon:
jr z, .randloop1
dec a
ld c, a
- ld b, $0
+ ld b, 0
add hl, bc
add hl, bc
; We now have the pointer to one of the last (rarest) three wild Pokemon found in that area.
@@ -870,7 +870,7 @@ RandomPhoneWildMon:
call Random
and %11
ld c, a
- ld b, $0
+ ld b, 0
add hl, bc
add hl, bc
inc hl
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
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-09 22:49:03 +0000