summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--engine/battle_anims/functions.asm8
-rw-r--r--engine/events/pokecenter_pc.asm16
-rw-r--r--engine/games/slot_machine.asm23
-rw-r--r--engine/gfx/color.asm10
-rw-r--r--engine/menus/intro_menu.asm35
-rw-r--r--engine/movie/intro.asm8
-rw-r--r--engine/phone/phone.asm10
-rw-r--r--engine/pokegear/pokegear.asm4
-rw-r--r--engine/pokemon/mon_menu.asm14
-rw-r--r--engine/printer/print_party.asm44
10 files changed, 94 insertions, 78 deletions
diff --git a/engine/battle_anims/functions.asm b/engine/battle_anims/functions.asm
index e23d1ccd..62561b55 100644
--- a/engine/battle_anims/functions.asm
+++ b/engine/battle_anims/functions.asm
@@ -974,7 +974,7 @@ Functioncd49c:
ret
.negative
- and $3f
+ and %00111111
cp $20
jr nc, .minus_256
cp $18
@@ -1989,7 +1989,7 @@ BattleAnimFunction_Kick:
dw .one
dw .two ; Jump Kick, Hi Jump Kick
dw .three ; Rolling Kick
- dw .four
+ dw .four ; Rolling Kick (continued)
.zero
ret
@@ -1999,13 +1999,13 @@ BattleAnimFunction_Kick:
add hl, bc
ld a, [hl]
cp $30
- jr c, .unknown_cda69
+ jr c, .move_down
ld hl, BATTLEANIMSTRUCT_JUMPTABLE_INDEX
add hl, bc
ld [hl], $0
ret
-.unknown_cda69
+.move_down
add $4
ld [hl], a
ret
diff --git a/engine/events/pokecenter_pc.asm b/engine/events/pokecenter_pc.asm
index 18848924..0503ee6f 100644
--- a/engine/events/pokecenter_pc.asm
+++ b/engine/events/pokecenter_pc.asm
@@ -233,28 +233,28 @@ _PlayersPC:
ld [wWhichIndexSet], a
ld hl, PlayersPCAskWhatDoText
call PC_DisplayTextWaitMenu
- call Function159ec
+ call .PlayersPC
call ExitMenu
ret
-Function159ec:
+.PlayersPC:
xor a
ld [wPCItemsCursor], a
ld [wPCItemsScrollPosition], a
ld hl, PlayersPCMenuData
call LoadMenuHeader
-.asm_159f9
+.loop
call UpdateTimePals
call DoNthMenu
- jr c, .asm_15a08
+ jr c, .turn_off
call MenuJumptable
- jr nc, .asm_159f9
- jr .asm_15a09
+ jr nc, .loop
+ jr .done
-.asm_15a08
+.turn_off
xor a
-.asm_15a09
+.done
call ExitMenu
ret
diff --git a/engine/games/slot_machine.asm b/engine/games/slot_machine.asm
index df34a7de..a0d99629 100644
--- a/engine/games/slot_machine.asm
+++ b/engine/games/slot_machine.asm
@@ -184,7 +184,7 @@ SlotsLoop:
ld [wCurSpriteOAMAddr], a
callfar DoNextFrameForFirst16Sprites
call .PrintCoinsAndPayout
- call .Stubbed_Function92d3c
+ call .Stubbed_AlternateMatchingSevensPalette
call DelayFrame
and a
ret
@@ -193,7 +193,7 @@ SlotsLoop:
scf
ret
-.Stubbed_Function92d3c:
+.Stubbed_AlternateMatchingSevensPalette:
; dummied out
ret
ld a, [wReel1ReelAction]
@@ -214,7 +214,7 @@ SlotsLoop:
and $7
ret nz
ldh a, [rBGP]
- xor %00001100
+ xor %00001100 ; alternates two palettes
call DmgToCgbBGPals
ret
@@ -848,17 +848,22 @@ Function93127: ; unreferenced
push hl
srl a
srl a
- add LOW(.Unknown_93137)
+ add LOW(.data)
ld l, a
ld a, 0
- adc HIGH(.Unknown_93137)
+ adc HIGH(.data)
ld h, a
ld a, [hl]
pop hl
ret
-.Unknown_93137:
- db 0, 1, 2, 3, 4, 5
+.data:
+ db 0 ; SLOTS_SEVEN
+ db 1 ; SLOTS_POKEBALL
+ db 2 ; SLOTS_CHERRY
+ db 3 ; SLOTS_PIKACHU
+ db 4 ; SLOTS_SQUIRTLE
+ db 5 ; SLOTS_STARYU
ReelActionJumptable:
ld hl, REEL_ACTION
@@ -1089,11 +1094,11 @@ ReelAction_WaitReel2SkipTo7:
add hl, bc
ld a, [hl]
and a
- jr z, .asm_9326b
+ jr z, .ready
dec [hl]
ret
-.asm_9326b
+.ready
ld a, SFX_THROW_BALL
call Slots_PlaySFX
ld hl, REEL_ACTION
diff --git a/engine/gfx/color.asm b/engine/gfx/color.asm
index 594f7edc..454a2f08 100644
--- a/engine/gfx/color.asm
+++ b/engine/gfx/color.asm
@@ -141,7 +141,7 @@ SGB_ApplyPartyMenuHPPals:
ld [hl], e
ret
-Function9102:
+Intro_LoadMagikarpPalettes:
call CheckCGB
ret z
; CGB only
@@ -172,7 +172,7 @@ Function9102:
RGB 08, 16, 28
RGB 00, 00, 00
-Function9136:
+Intro_LoadAllPal0:
call CheckCGB
ret nz
ldh a, [hSGB]
@@ -181,7 +181,7 @@ Function9136:
ld hl, BlkPacket_AllPal0
jp PushSGBPals
-Function9144: ; unreferenced
+Intro_LoadBetaIntroVenusaurPalettes: ; unreferenced
call CheckCGB
jr nz, .cgb
ldh a, [hSGB]
@@ -196,7 +196,7 @@ Function9144: ; unreferenced
call GetPredefPal
jp LoadHLPaletteIntoDE
-Function915e: ; unreferenced
+Intro_LoadPackPalettes: ; unreferenced
call CheckCGB
jr nz, .cgb
ldh a, [hSGB]
@@ -243,7 +243,7 @@ Intro_LoadMonPalette:
call LoadPalette_White_Col1_Col2_Black
ret
-Function91b4: ; unreferenced
+LoadBetaPokerPalettes: ; unreferenced
ldh a, [hCGB]
and a
jr nz, .cgb
diff --git a/engine/menus/intro_menu.asm b/engine/menus/intro_menu.asm
index 784da3cf..80db603f 100644
--- a/engine/menus/intro_menu.asm
+++ b/engine/menus/intro_menu.asm
@@ -908,7 +908,7 @@ RunTitleScreen:
farcall PlaySpriteAnimations
xor a
ldh [hOAMUpdate], a
- call Function64b1
+ call UpdateTitleTrailSprite
call DelayFrame
and a
ret
@@ -1069,7 +1069,7 @@ ResetClock:
farcall _ResetClock
jp Init
-Function64b1:
+UpdateTitleTrailSprite:
; If bit 0 or 1 of [wTitleScreenTimer] is set, we don't need to be here.
ld a, [wTitleScreenTimer]
and %00000011
@@ -1082,9 +1082,9 @@ IF DEF(_GOLD)
ld h, 0
add hl, hl
add hl, hl
- ld de, .Data_64e0
+ ld de, .TitleTrailCoords
add hl, de
- ; If bit 2 of [wTitleScreenTimer] is set, get the second dw; else, get the first dw
+ ; If bit 2 of [wTitleScreenTimer] is set, get the second coords; else, get the first coords
ld a, [wTitleScreenTimer]
and %00000100
srl a
@@ -1106,14 +1106,25 @@ ENDC
ret
IF DEF(_GOLD)
-.Data_64e0:
-; frame 0 y, x; frame 1 y, x
- db 11 * 8 + 4, 10 * 8, 0 * 8, 0 * 8
- db 11 * 8 + 4, 13 * 8, 11 * 8 + 4, 11 * 8
- db 11 * 8 + 4, 13 * 8, 11 * 8 + 4, 15 * 8
- db 11 * 8 + 4, 17 * 8, 11 * 8 + 4, 15 * 8
- db 0 * 8, 0 * 8, 11 * 8 + 4, 15 * 8
- db 0 * 8, 0 * 8, 11 * 8 + 4, 11 * 8
+.TitleTrailCoords:
+trail_coords: MACRO
+rept _NARG / 2
+_dx = 4
+if \1 == 0 && \2 == 0
+_dx = 0
+endc
+ dbpixel \1, \2, _dx, 0
+ shift
+ shift
+endr
+ENDM
+ ; frame 0 y, x; frame 1 y, x
+ trail_coords 11, 10, 0, 0
+ trail_coords 11, 13, 11, 11
+ trail_coords 11, 13, 11, 15
+ trail_coords 11, 17, 11, 15
+ trail_coords 0, 0, 11, 15
+ trail_coords 0, 0, 11, 11
ENDC
Copyright:
diff --git a/engine/movie/intro.asm b/engine/movie/intro.asm
index 01eff145..61335d9b 100644
--- a/engine/movie/intro.asm
+++ b/engine/movie/intro.asm
@@ -312,12 +312,12 @@ Functione4ed5:
ld hl, wIntroFrameCounter2
ld a, [hl]
and %00011111
- jr z, .asm_e4ee1
+ jr z, .load_palettes
call Intro_InitMagikarps
ret
-.asm_e4ee1
- callfar Function9102
+.load_palettes
+ callfar Intro_LoadMagikarpPalettes
ret
Functione4ee8:
@@ -674,7 +674,7 @@ IntroScene8:
ld [wIntroFrameCounter1], a
ld hl, wIntroJumptableIndex
inc [hl]
- callfar Function9136
+ callfar Intro_LoadAllPal0
ret
IntroScene9:
diff --git a/engine/phone/phone.asm b/engine/phone/phone.asm
index 7b2646ed..e94ed412 100644
--- a/engine/phone/phone.asm
+++ b/engine/phone/phone.asm
@@ -318,7 +318,7 @@ SpecialCallWhereverYouAre:
scf
ret
-Function901a1:
+MakePhoneCallFromPokegear:
; Don't do the call if you're in a link communication
ld a, [wLinkMode]
and a
@@ -469,7 +469,7 @@ RingTwice_StartCall:
Phone_CallerTextboxWithName:
ld a, [wCurCaller]
ld b, a
- call Function90357
+ call Phone_TextboxWithName
ret
PhoneCall::
@@ -576,7 +576,7 @@ Phone_Wait20Frames:
farcall PhoneRing_CopyTilemapAtOnce
ret
-Function90357:
+Phone_TextboxWithName:
push bc
call Phone_CallerTextbox
hlcoord 1, 1
@@ -586,7 +586,7 @@ Function90357:
ld d, h
ld e, l
pop bc
- call Function90374
+ call GetCallerClassAndName
ret
Phone_CallerTextbox:
@@ -596,7 +596,7 @@ Phone_CallerTextbox:
call Textbox
ret
-Function90374:
+GetCallerClassAndName:
ld h, d
ld l, e
ld a, b
diff --git a/engine/pokegear/pokegear.asm b/engine/pokegear/pokegear.asm
index 566aecc1..e7ffe340 100644
--- a/engine/pokegear/pokegear.asm
+++ b/engine/pokegear/pokegear.asm
@@ -891,7 +891,7 @@ PokegearPhone_MakePhoneCall:
call WaitSFX
ld a, [wPokegearPhoneSelectedPerson]
ld b, a
- call Function901a1
+ call MakePhoneCallFromPokegear
ld c, 10
call DelayFrames
ld hl, wOptions
@@ -1036,7 +1036,7 @@ PokegearPhone_UpdateDisplayList:
ld e, l
pop af
ld b, a
- call Function90374
+ call GetCallerClassAndName
pop hl
ld a, [wPokegearPhoneLoadNameBuffer]
inc a
diff --git a/engine/pokemon/mon_menu.asm b/engine/pokemon/mon_menu.asm
index 745d3936..2d793c79 100644
--- a/engine/pokemon/mon_menu.asm
+++ b/engine/pokemon/mon_menu.asm
@@ -346,11 +346,11 @@ TakePartyItem:
call GetPartyItemLocation
ld a, [hl]
and a
- jr z, .asm_13053
+ jr z, .not_holding_item
ld [wCurItem], a
call ReceiveItemFromPokemon
- jr nc, .asm_1305b
+ jr nc, .item_storage_full
farcall ItemIsMail
call GetPartyItemLocation
@@ -360,18 +360,18 @@ TakePartyItem:
call GetItemName
ld hl, PokemonTookItemText
call MenuTextboxBackup
- jr .asm_13061
+ jr .done
-.asm_13053
+.not_holding_item
ld hl, PokemonNotHoldingText
call MenuTextboxBackup
- jr .asm_13061
+ jr .done
-.asm_1305b
+.item_storage_full
ld hl, ItemStorageFullText
call MenuTextboxBackup
-.asm_13061
+.done
ret
GiveTakeItemMenuData:
diff --git a/engine/printer/print_party.asm b/engine/printer/print_party.asm
index 7b98a337..568a0c92 100644
--- a/engine/printer/print_party.asm
+++ b/engine/printer/print_party.asm
@@ -8,12 +8,12 @@ PrintPage1:
hlcoord 17, 1, wPrinterTilemapBuffer
ld a, $62
ld [hli], a
- inc a
+ inc a ; $63
ld [hl], a
hlcoord 17, 2, wPrinterTilemapBuffer
ld a, $64
ld [hli], a
- inc a
+ inc a ; $65
ld [hl], a
hlcoord 1, 9, wPrinterTilemapBuffer
ld a, " "
@@ -173,7 +173,7 @@ PrintPartyMonPage1:
ld [wNamedObjectIndexBuffer], a
ld [wCurSpecies], a
ld hl, wPartyMonNicknames
- call Function1c0375
+ call GetCurPartyMonName
hlcoord 8, 4
call PlaceString
hlcoord 9, 6
@@ -190,26 +190,26 @@ PrintPartyMonPage1:
lb bc, PRINTNUM_LEADINGZEROS | 1, 3
call PrintNum
hlcoord 1, 9
- ld de, String1c03b7
+ ld de, PrintParty_OTString
call PlaceString
ld hl, wPartyMonOT
- call Function1c0375
+ call GetCurPartyMonName
hlcoord 4, 9
call PlaceString
hlcoord 1, 11
- ld de, String1c03c0
+ ld de, PrintParty_IDNoString
call PlaceString
hlcoord 4, 11
ld de, wTempMonID
lb bc, PRINTNUM_LEADINGZEROS | 2, 5
call PrintNum
hlcoord 1, 14
- ld de, String1c03bb
+ ld de, PrintParty_MoveString
call PlaceString
hlcoord 7, 14
ld a, [wTempMonMoves + 0]
- call Function1c0381
- call Function1c0393
+ call PlaceMoveNameString
+ call PlaceGenderAndShininess
ld hl, wTempMonDVs
predef GetUnownLetter
hlcoord 0, 0
@@ -256,15 +256,15 @@ PrintPartyMonPage2:
call CopyBytes
hlcoord 7, 0
ld a, [wTempMonMoves + 1]
- call Function1c0381
+ call PlaceMoveNameString
hlcoord 7, 2
ld a, [wTempMonMoves + 2]
- call Function1c0381
+ call PlaceMoveNameString
hlcoord 7, 4
ld a, [wTempMonMoves + 3]
- call Function1c0381
+ call PlaceMoveNameString
hlcoord 7, 7
- ld de, String1c03c3
+ ld de, PrintParty_StatsString
call PlaceString
hlcoord 16, 7
ld de, wTempMonAttack
@@ -292,7 +292,7 @@ PrintPartyMonPage2:
call PrintNum
ret
-Function1c0375:
+GetCurPartyMonName:
ld bc, NAME_LENGTH
ld a, [wCurPartyMon]
call AddNTimes
@@ -300,7 +300,7 @@ Function1c0375:
ld d, h
ret
-Function1c0381:
+PlaceMoveNameString:
and a
jr z, .no_move
@@ -309,13 +309,13 @@ Function1c0381:
jr .got_string
.no_move
- ld de, String1c03ea
+ ld de, PrintParty_NoMoveString
.got_string
call PlaceString
ret
-Function1c0393:
+PlaceGenderAndShininess:
farcall GetGender
ld a, " "
jr c, .got_gender
@@ -333,16 +333,16 @@ Function1c0393:
ld [hl], "⁂"
ret
-String1c03b7:
+PrintParty_OTString:
db "OT/@"
-String1c03bb:
+PrintParty_MoveString:
db "MOVE@"
-String1c03c0:
+PrintParty_IDNoString:
db "<ID>№@"
-String1c03c3:
+PrintParty_StatsString:
db "ATTACK"
next "DEFENSE"
next "SPCL.ATK"
@@ -350,7 +350,7 @@ String1c03c3:
next "SPEED"
db "@"
-String1c03ea:
+PrintParty_NoMoveString:
db "------------@"
GBPrinterHPIcon:
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-16 16:26:53 +0000