summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
Diffstat (limited to 'main.asm')
-rw-r--r--main.asm444
1 files changed, 91 insertions, 353 deletions
diff --git a/main.asm b/main.asm
index aa000622b..749427da2 100644
--- a/main.asm
+++ b/main.asm
@@ -734,13 +734,13 @@ BlankScreen: ; 8000
call SetPalettes
ret
-GetSpawnCoord: ; 8029
+SpawnPlayer: ; 8029
ld a, -1
ld [wObjectFollow_Leader], a
ld [wObjectFollow_Follower], a
ld a, $0
ld hl, PlayerObjectTemplate
- call Function19a6
+ call CopyPlayerObjectTemplate
ld b, $0
call PlayerSpawn_ConvertCoords
ld a, $0
@@ -821,23 +821,23 @@ RefreshPlayerCoords: ; 80b8
ld a, [XCoord]
add 4
ld d, a
- ld hl, PlayerNextMapX
+ ld hl, PlayerStandingMapX
sub [hl]
ld [hl], d
ld hl, MapObjects + MAPOBJECT_X_COORD
ld [hl], d
- ld hl, PlayerMapX
+ ld hl, PlayerLastMapX
ld [hl], d
ld d, a
ld a, [YCoord]
add 4
ld e, a
- ld hl, PlayerNextMapY
+ ld hl, PlayerStandingMapY
sub [hl]
ld [hl], e
ld hl, MapObjects + MAPOBJECT_Y_COORD
ld [hl], e
- ld hl, PlayerMapY
+ ld hl, PlayerLastMapY
ld [hl], e
ld e, a
ld a, [wObjectFollow_Leader]
@@ -2525,7 +2525,7 @@ UsedSurfScript: ; c986
waitbutton
closetext
- callasm Functionc9a2 ; empty function
+ callasm .empty_fn ; empty function
copybytetovar Buffer2
writevarcode VAR_MOVEMENT
@@ -2537,7 +2537,7 @@ UsedSurfScript: ; c986
applymovement PLAYER, MovementBuffer ; PLAYER, MovementBuffer
end
-Functionc9a2: ; c9a2
+.empty_fn: ; c9a2
callba MobileFn_1060bb ; empty
ret
@@ -2808,7 +2808,7 @@ Script_UsedWaterfall: ; 0xcb20
.CheckContinueWaterfall: ; cb38
xor a
ld [ScriptVar], a
- ld a, [PlayerNextTile]
+ ld a, [PlayerStandingTile]
call CheckWaterfallTile
ret z
callba MobileFn_1060c1
@@ -3804,7 +3804,7 @@ BikeFunction: ; d0b3
jr .done
.CantGetOffBike
- ld hl, UnknownScript_0xd171
+ ld hl, Script_CantGetOffBike
jr .done
.CannotUseBike
@@ -3835,8 +3835,8 @@ BikeFunction: ; d0b3
jr .nope
.ok
- call Function184a
- and $f
+ call GetPlayerStandingTile
+ and $f ; can't use our bike in a wall or on water
jr nz, .nope
xor a
ret
@@ -3849,7 +3849,7 @@ Script_GetOnBike: ; 0xd13e
reloadmappart
special UpdateTimePals
writecode VAR_MOVEMENT, PLAYER_BIKE
- writetext UnknownText_0xd17c
+ writetext GotOnTheBikeText
waitbutton
closetext
special ReplaceKrisSprite
@@ -3861,7 +3861,7 @@ Script_GetOnBike_Register: ; 0xd14e
special ReplaceKrisSprite
end
-Functiond156: ; unreferenced
+; XXX
nop
ret
@@ -3869,7 +3869,7 @@ Script_GetOffBike: ; 0xd158
reloadmappart
special UpdateTimePals
writecode VAR_MOVEMENT, PLAYER_NORMAL
- writetext UnknownText_0xd181
+ writetext GotOffTheBikeText
waitbutton
FinishGettingOffBike:
@@ -3882,23 +3882,23 @@ Script_GetOffBike_Register: ; 0xd16b
writecode VAR_MOVEMENT, PLAYER_NORMAL
jump FinishGettingOffBike
-UnknownScript_0xd171: ; 0xd171
- writetext UnknownText_0xd177
+Script_CantGetOffBike: ; 0xd171
+ writetext .CantGetOffBikeText
waitbutton
closetext
end
-UnknownText_0xd177: ; 0xd177
+.CantGetOffBikeText: ; 0xd177
; You can't get off here!
text_jump UnknownText_0x1c099a
db "@"
-UnknownText_0xd17c: ; 0xd17c
+GotOnTheBikeText: ; 0xd17c
; got on the @ .
text_jump UnknownText_0x1c09b2
db "@"
-UnknownText_0xd181: ; 0xd181
+GotOffTheBikeText: ; 0xd181
; got off the @ .
text_jump UnknownText_0x1c09c7
db "@"
@@ -5124,7 +5124,6 @@ INCLUDE "engine/pack.asm"
INCLUDE "engine/time.asm"
INCLUDE "engine/tmhm.asm"
INCLUDE "engine/namingscreen.asm"
-INCLUDE "engine/compose_mail.asm"
Script_AbortBugContest: ; 0x122c1
checkflag ENGINE_BUG_CONTEST_TIMER
@@ -5280,29 +5279,27 @@ Script_JumpStdFromRAM: ; 0x1369a
INCLUDE "event/bug_contest_judging.asm"
-; decreases all pokemon's pokerus counter by b. if the lower nybble reaches zero, the pokerus is cured.
ApplyPokerusTick: ; 13988
+; decreases all pokemon's pokerus counter by b. if the lower nybble reaches zero, the pokerus is cured.
ld hl, PartyMon1PokerusStatus ; PartyMon1 + MON_PKRS
ld a, [PartyCount]
and a
- ret z
+ ret z ; make sure it's not wasting time on an empty party
ld c, a
.loop
ld a, [hl]
- and $f
- jr z, .does_not_have_pokerus
- sub b
- jr nc, .ok
+ and $f ; lower nybble is the number of days remaining
+ jr z, .next ; if already 0, skip
+ sub b ; subtract the number of days
+ jr nc, .ok ; max(result, 0)
xor a
-
.ok
- ld d, a
+ ld d, a ; back up this value because we need to preserve the strain (upper nybble)
ld a, [hl]
and $f0
add d
- ld [hl], a
-
-.does_not_have_pokerus
+ ld [hl], a ; this prevents a cured pokemon from recontracting pokerus
+.next
ld de, PARTYMON_STRUCT_LENGTH
add hl, de
dec c
@@ -5414,7 +5411,7 @@ Pokepic:: ; 244e3
call MenuBox
call UpdateSprites
call ApplyTilemap
- ld b, SCGB_12
+ ld b, SCGB_POKEPIC
call GetSGBLayout
xor a
ld [hBGMapMode], a
@@ -5431,9 +5428,9 @@ Pokepic:: ; 244e3
ld c, a
call Coord2Tile
ld a, $80
- ld [hFillBox], a
+ ld [hGraphicStartTile], a
lb bc, 7, 7
- predef FillBox
+ predef PlaceGraphic
call WaitBGMap
ret
@@ -5679,44 +5676,44 @@ Function24b8f: ; 24b8f
.booru_ko: ; 24bd4
db "ボール こ@"
-Function24bdc: ; 24bdc
+StartMenu_DrawBugContestStatusBox: ; 24bdc
hlcoord 0, 0
- ld b, $5
- ld c, $11
+ ld b, 5
+ ld c, 17
call TextBox
ret
-Function24be7: ; 24be7
+StartMenu_PrintBugContestStatus: ; 24be7
ld hl, Options
ld a, [hl]
push af
- set 4, [hl]
- call Function24bdc
+ set NO_TEXT_SCROLL, [hl]
+ call StartMenu_DrawBugContestStatusBox
hlcoord 1, 5
- ld de, String24c52
+ ld de, .Balls_EN
call PlaceString
hlcoord 8, 5
- ld de, wSafariBallsRemaining
+ ld de, wParkBallsRemaining
lb bc, PRINTNUM_RIGHTALIGN | 1, 2
call PrintNum
hlcoord 1, 1
- ld de, String24c4b
+ ld de, .CAUGHT
call PlaceString
ld a, [wContestMon]
and a
- ld de, String24c59
- jr z, .asm_24c1e
+ ld de, .None
+ jr z, .no_contest_mon
ld [wd265], a
call GetPokemonName
-.asm_24c1e
+.no_contest_mon
hlcoord 8, 1
call PlaceString
ld a, [wContestMon]
and a
- jr z, .asm_24c3e
+ jr z, .skip_level
hlcoord 1, 3
- ld de, String24c5e
+ ld de, .LEVEL
call PlaceString
ld a, [wContestMonLevel]
ld h, b
@@ -5725,20 +5722,20 @@ Function24be7: ; 24be7
ld c, $3
call Function3842
-.asm_24c3e
+.skip_level
pop af
ld [Options], a
ret
-String24c43: ; 24c43
+.Balls_JP: ; 24c43
db "ボール こ@"
-String24c4b: ; 24c4b
+.CAUGHT: ; 24c4b
db "CAUGHT@"
-String24c52: ; 24c52
+.Balls_EN: ; 24c52
db "BALLS:@"
-String24c59: ; 24c59
+.None: ; 24c59
db "None@"
-String24c5e: ; 24c5e
+.LEVEL: ; 24c5e
db "LEVEL@"
FindApricornsInBag: ; 24c64
@@ -5800,226 +5797,7 @@ INCLUDE "engine/mon_menu.asm"
INCLUDE "battle/menu.asm"
INCLUDE "engine/buy_sell_toss.asm"
INCLUDE "engine/trainer_card.asm"
-
-ProfOaksPC: ; 0x265d3
- ld hl, OakPCText1
- call MenuTextBox
- call YesNoBox
- jr c, .shutdown
- call ProfOaksPCBoot ; player chose "yes"?
-.shutdown
- ld hl, OakPCText4
- call PrintText
- call JoyWaitAorB
- call ExitMenu
- ret
-
-ProfOaksPCBoot ; 0x265ee
- ld hl, OakPCText2
- call PrintText
- call Rate
- call PlaySFX ; sfx loaded by previous Rate function call
- call JoyWaitAorB
- call WaitSFX
- ret
-
-ProfOaksPCRating: ; 0x26601
- call Rate
- push de
- ld de, MUSIC_NONE
- call PlayMusic
- pop de
- call PlaySFX
- call JoyWaitAorB
- call WaitSFX
- ret
-
-Rate: ; 0x26616
-; calculate Seen/Owned
- ld hl, PokedexSeen
- ld b, EndPokedexSeen - PokedexSeen
- call CountSetBits
- ld [wd002], a
- ld hl, PokedexCaught
- ld b, EndPokedexCaught - PokedexCaught
- call CountSetBits
- ld [wd003], a
-
-; print appropriate rating
- call .UpdateRatingBuffers
- ld hl, OakPCText3
- call PrintText
- call JoyWaitAorB
- ld a, [wd003]
- ld hl, OakRatings
- call FindOakRating
- push de
- call PrintText
- pop de
- ret
-
-.UpdateRatingBuffers: ; 0x26647
- ld hl, StringBuffer3
- ld de, wd002
- call .UpdateRatingBuffer
- ld hl, StringBuffer4
- ld de, wd003
- call .UpdateRatingBuffer
- ret
-
-.UpdateRatingBuffer: ; 0x2665a
- push hl
- ld a, "@"
- ld bc, ITEM_NAME_LENGTH
- call ByteFill
- pop hl
- lb bc, PRINTNUM_RIGHTALIGN | 1, 3
- call PrintNum
- ret
-
-FindOakRating: ; 0x2666b
-; return sound effect in de
-; return text pointer in hl
- nop
- ld c, a
-.loop
- ld a, [hli]
- cp c
- jr nc, .match
-rept 4
- inc hl
-endr
- jr .loop
-
-.match
- ld a, [hli]
- ld e, a
- ld a, [hli]
- ld d, a
- ld a, [hli]
- ld h, [hl]
- ld l, a
- ret
-
-OakRatings: ; 0x2667f
-oakrating: MACRO
- db \1
- dw \2, \3
-endm
-
-; if you caught at most this many, play this sound, load this text
- oakrating 9, SFX_DEX_FANFARE_LESS_THAN_20, OakRating01
- oakrating 19, SFX_DEX_FANFARE_LESS_THAN_20, OakRating02
- oakrating 34, SFX_DEX_FANFARE_20_49, OakRating03
- oakrating 49, SFX_DEX_FANFARE_20_49, OakRating04
- oakrating 64, SFX_DEX_FANFARE_50_79, OakRating05
- oakrating 79, SFX_DEX_FANFARE_50_79, OakRating06
- oakrating 94, SFX_DEX_FANFARE_80_109, OakRating07
- oakrating 109, SFX_DEX_FANFARE_80_109, OakRating08
- oakrating 124, SFX_CAUGHT_MON, OakRating09
- oakrating 139, SFX_CAUGHT_MON, OakRating10
- oakrating 154, SFX_DEX_FANFARE_140_169, OakRating11
- oakrating 169, SFX_DEX_FANFARE_140_169, OakRating12
- oakrating 184, SFX_DEX_FANFARE_170_199, OakRating13
- oakrating 199, SFX_DEX_FANFARE_170_199, OakRating14
- oakrating 214, SFX_DEX_FANFARE_200_229, OakRating15
- oakrating 229, SFX_DEX_FANFARE_200_229, OakRating16
- oakrating 239, SFX_DEX_FANFARE_230_PLUS, OakRating17
- oakrating 248, SFX_DEX_FANFARE_230_PLUS, OakRating18
- oakrating 255, SFX_DEX_FANFARE_230_PLUS, OakRating19
-
-OakPCText1: ; 0x266de
- text_jump _OakPCText1
- db "@"
-
-OakPCText2: ; 0x266e3
- text_jump _OakPCText2
- db "@"
-
-OakPCText3: ; 0x266e8
- text_jump _OakPCText3
- db "@"
-
-OakRating01:
- text_jump _OakRating01
- db "@"
-
-OakRating02:
- text_jump _OakRating02
- db "@"
-
-OakRating03:
- text_jump _OakRating03
- db "@"
-
-OakRating04:
- text_jump _OakRating04
- db "@"
-
-OakRating05:
- text_jump _OakRating05
- db "@"
-
-OakRating06:
- text_jump _OakRating06
- db "@"
-
-OakRating07:
- text_jump _OakRating07
- db "@"
-
-OakRating08:
- text_jump _OakRating08
- db "@"
-
-OakRating09:
- text_jump _OakRating09
- db "@"
-
-OakRating10:
- text_jump _OakRating10
- db "@"
-
-OakRating11:
- text_jump _OakRating11
- db "@"
-
-OakRating12:
- text_jump _OakRating12
- db "@"
-
-OakRating13:
- text_jump _OakRating13
- db "@"
-
-OakRating14:
- text_jump _OakRating14
- db "@"
-
-OakRating15:
- text_jump _OakRating15
- db "@"
-
-OakRating16:
- text_jump _OakRating16
- db "@"
-
-OakRating17:
- text_jump _OakRating17
- db "@"
-
-OakRating18:
- text_jump _OakRating18
- db "@"
-
-OakRating19:
- text_jump _OakRating19
- db "@"
-
-OakPCText4: ; 0x2674c
- text_jump _OakPCText4
- db "@"
-
+INCLUDE "engine/prof_oaks_pc.asm"
INCLUDE "engine/decorations.asm"
PadCoords_de: ; 27092
@@ -6162,7 +5940,7 @@ INCLUDE "battle/moves/move_effects_pointers.asm"
MoveEffects: ; 2732e
INCLUDE "battle/moves/move_effects.asm"
-Function27a28: ; 27a28
+Kurt_SelectQuantity_InterpretJoypad: ; 27a28
call BuySellToss_InterpretJoypad
ld b, a
ret
@@ -6731,9 +6509,9 @@ endr
ld [hl], VBGMap0 / $100
ret
-FillBox: ; 2ef6e
+PlaceGraphic: ; 2ef6e
; Fill wBoxAlignment-aligned box width b height c
-; with iterating tile starting from hFillBox at hl.
+; with iterating tile starting from hGraphicStartTile at hl.
; Predef $13
ld de, SCREEN_WIDTH
@@ -6742,7 +6520,7 @@ FillBox: ; 2ef6e
and a
jr nz, .right
- ld a, [hFillBox]
+ ld a, [hGraphicStartTile]
.x1
push bc
push hl
@@ -6769,7 +6547,7 @@ FillBox: ; 2ef6e
add hl, bc
pop bc
- ld a, [hFillBox]
+ ld a, [hGraphicStartTile]
.x2
push bc
push hl
@@ -6843,7 +6621,7 @@ GetOTName: ; 39550
.ok
ld bc, TRAINER_CLASS_NAME_LENGTH
- ld de, OTName
+ ld de, OTClassName
push de
call CopyBytes
pop de
@@ -7487,47 +7265,7 @@ ScrollBGMapPalettes:: ; 4c03f
INCLUDE "tilesets/palette_maps.asm"
TileCollisionTable:: ; 4ce1f
-; 00 land
-; 01 water
-; 0f wall
-; 11 talkable water
-; 1f talkable wall
-
- db NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + WATRTILE
- db NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + WATRTILE
- db NULL + LANDTILE, NULL + LANDTILE, TALK + WATRTILE, NULL + LANDTILE, NULL + LANDTILE, TALK + WATRTILE, NULL + LANDTILE, NULL + LANDTILE
- db NULL + LANDTILE, NULL + LANDTILE, TALK + WATRTILE, NULL + LANDTILE, NULL + LANDTILE, TALK + WATRTILE, NULL + LANDTILE, NULL + LANDTILE
- db NULL + WALLTILE, NULL + WALLTILE, TALK + WALLTILE, NULL + LANDTILE, TALK + WALLTILE, NULL + WALLTILE, NULL + WALLTILE, NULL + WATRTILE
- db NULL + WALLTILE, NULL + WALLTILE, TALK + WALLTILE, NULL + LANDTILE, TALK + WALLTILE, NULL + WALLTILE, NULL + WALLTILE, NULL + WATRTILE
- db NULL + WALLTILE, NULL + WALLTILE, NULL + WALLTILE, NULL + WALLTILE, NULL + WALLTILE, NULL + WALLTILE, NULL + WALLTILE, NULL + WALLTILE
- db NULL + WALLTILE, NULL + WALLTILE, NULL + WALLTILE, NULL + WALLTILE, NULL + WALLTILE, NULL + WALLTILE, NULL + WALLTILE, NULL + WALLTILE
-
- db NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE
- db NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE
- db NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE
- db NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE
- db NULL + LANDTILE, NULL + LANDTILE, NULL + WATRTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE
- db NULL + LANDTILE, NULL + LANDTILE, NULL + WATRTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE
- db NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE
- db NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE
-
- db NULL + WATRTILE, NULL + WATRTILE, NULL + WATRTILE, NULL + WATRTILE, NULL + WATRTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE
- db NULL + WATRTILE, NULL + WATRTILE, NULL + WATRTILE, NULL + WATRTILE, NULL + WATRTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE
- db NULL + WATRTILE, NULL + WATRTILE, NULL + WATRTILE, NULL + WATRTILE, NULL + WATRTILE, NULL + WATRTILE, NULL + WATRTILE, NULL + WATRTILE
- db NULL + WATRTILE, NULL + WATRTILE, NULL + WATRTILE, NULL + WATRTILE, NULL + WATRTILE, NULL + WATRTILE, NULL + WATRTILE, NULL + WATRTILE
- db NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE
- db NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE
- db NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE
- db NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE
-
- db NULL + WALLTILE, NULL + WALLTILE, NULL + WALLTILE, NULL + WALLTILE, NULL + WALLTILE, NULL + WALLTILE, NULL + WALLTILE, NULL + WALLTILE
- db NULL + WALLTILE, NULL + WALLTILE, NULL + WALLTILE, NULL + WALLTILE, NULL + WALLTILE, NULL + WALLTILE, NULL + WALLTILE, NULL + WALLTILE
- db NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE
- db NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE
- db NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE
- db NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE
- db NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE
- db NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + LANDTILE, NULL + WATRTILE
+INCLUDE "tilesets/collision.asm"
EmptyAllSRAMBanks: ; 4cf1f
ld a, $0
@@ -9235,7 +8973,7 @@ CheckBattleScene: ; 4ea44
.asm_4ea72
ld a, $5
- ld hl, wdc00
+ ld hl, w5_dc00
call GetFarWRAMByte
bit 0, a
jr z, .off
@@ -9416,50 +9154,50 @@ Strings50a42: ; 50a42
dw .Youngster
dw .BugCatcher
dw .Lass
- dw OTName
+ dw OTClassName
dw .JrTrainerM
dw .JrTrainerF
dw .Pokemaniac
dw .SuperNerd
- dw OTName
- dw OTName
+ dw OTClassName
+ dw OTClassName
dw .Burglar
dw .Engineer
dw .Jack
- dw OTName
+ dw OTClassName
dw .Swimmer
- dw OTName
- dw OTName
+ dw OTClassName
+ dw OTClassName
dw .Beauty
- dw OTName
+ dw OTClassName
dw .Rocker
dw .Juggler
- dw OTName
- dw OTName
+ dw OTClassName
+ dw OTClassName
dw .Blackbelt
- dw OTName
+ dw OTClassName
dw .ProfOak
dw .Chief
dw .Scientist
- dw OTName
+ dw OTClassName
dw .Rocket
dw .CooltrainerM
dw .CooltrainerF
- dw OTName
- dw OTName
- dw OTName
- dw OTName
- dw OTName
- dw OTName
- dw OTName
- dw OTName
- dw OTName
- dw OTName
- dw OTName
- dw OTName
- dw OTName
- dw OTName
- dw OTName
+ dw OTClassName
+ dw OTClassName
+ dw OTClassName
+ dw OTClassName
+ dw OTClassName
+ dw OTClassName
+ dw OTClassName
+ dw OTClassName
+ dw OTClassName
+ dw OTClassName
+ dw OTClassName
+ dw OTClassName
+ dw OTClassName
+ dw OTClassName
+ dw OTClassName
.Youngster db "たんパン@"
.BugCatcher db "むしとり@"
@@ -11061,7 +10799,7 @@ MovePlayerPic: ; 88266
xor a
ld [hBGMapMode], a
lb bc, 7, 7
- predef FillBox
+ predef PlaceGraphic
xor a
ld [hBGMapThird], a
call WaitBGMap
@@ -11213,7 +10951,7 @@ GetChrisBackpic: ; 88830
predef DecompressPredef
ret
-Function88840: ; 88840
+HOF_LoadTrainerFrontpic: ; 88840
call WaitBGMap
xor a
ld [hBGMapMode], a
@@ -11269,10 +11007,10 @@ DrawIntroPlayerPic: ; 88874
; Draw
xor a
- ld [hFillBox], a
+ ld [hGraphicStartTile], a
hlcoord 6, 4
lb bc, 7, 7
- predef FillBox
+ predef PlaceGraphic
ret
ChrisPic: ; 888a9
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-23 15:05:02 +0000