diff options
Diffstat (limited to 'main.asm')
| -rw-r--r-- | main.asm | 349 |
1 files changed, 175 insertions, 174 deletions
@@ -132,7 +132,7 @@ NewGame: ; 5b6b ld [wc2cc], a call ResetWRAM call Function5b44 - call Function5b8f + call AreYouABoyOrAreYouAGirl call OakSpeech call InitializeWorld ld a, 1 @@ -146,10 +146,10 @@ NewGame: ; 5b6b jp Function5e5d ; 5b8f -Function5b8f: ; 5b8f - callba Function10632f +AreYouABoyOrAreYouAGirl: ; 5b8f + callba Function10632f ; some mobile stuff jr c, .ok - callba Function48dcb + callba AreYouABoyOrAreYouAGirl_Menu ret .ok @@ -415,7 +415,7 @@ Continue: ; 5d65 callba TryLoadSaveFile jr c, .FailToLoad callba Function150b9 - call Function1d6e + call LoadMenuDataHeader_0x1d75 call Function5e85 ld a, $1 ld [hBGMapMode], a @@ -1579,7 +1579,7 @@ Function64db: ; 64db ; 6508 LearnMove: ; 6508 - call Function309d + call LoadTileMapToTempTileMap ld a, [CurPartyMon] ld hl, PartyMonNicknames call GetNick @@ -1741,7 +1741,7 @@ ForgetMove: ; 65d3 ld [wcfa7], a call Function1bc9 push af - call Function30b4 + call Call_LoadTempTileMapToTileMap pop af pop hl bit 1, a @@ -3176,7 +3176,7 @@ Function8000: ; 8000 ld a, $7 call ByteFill call Function3200 - call Function32f9 + call SetPalettes ret ; 8029 @@ -5182,7 +5182,7 @@ FlyFunction: ; ca3b .outdoors xor a ld [$ffde], a - call Function1d6e + call LoadMenuDataHeader_0x1d75 call ClearSprites callba _FlyMap ld a, e @@ -9654,7 +9654,7 @@ TextJump_WasSentToBillsPC: ; 0xe3d9 Functione3de: ; e3de push de - call Function1d6e + call LoadMenuDataHeader_0x1d75 call Function2ed3 pop de push de @@ -9695,7 +9695,7 @@ UnknownText_0xe417: ; 0xe417 Functione41c: ; e41c (3:641c) xor a ld [hBGMapMode], a ; $ff00+$d4 - call Function1d6e + call LoadMenuDataHeader_0x1d75 call ClearPCItemScreen ld hl, Options ld a, [hl] @@ -9725,7 +9725,7 @@ Functione443: ; e443 (3:6443) ld a, $1 .asm_e44b ld [wcf88], a - call Function32f9 + call SetPalettes xor a ld [wcf76], a ld [hBGMapMode], a ; $ff00+$d4 @@ -9791,7 +9791,7 @@ Functione4cb: ; e4cb ; e4cd Functione4cd: ; e4cd - call Function1d6e + call LoadMenuDataHeader_0x1d75 callba Function44781 jr nc, .asm_e4e0 ld hl, UnknownText_0xe4f9 @@ -9818,7 +9818,7 @@ UnknownText_0xe4f9: ; 0xe4f9 ; 0xe4fe Functione4fe: ; e4fe (3:64fe) - call Function1d6e + call LoadMenuDataHeader_0x1d75 callba Functione2391 call Function222a call ClearPCItemScreen @@ -9894,7 +9894,7 @@ Functione538: ; e538 Functione559: ; e559 (3:6559) - call Function1d6e + call LoadMenuDataHeader_0x1d75 callba Functione2583 call Function222a call ClearPCItemScreen @@ -9945,7 +9945,7 @@ ClearPCItemScreen: ; e58b ld bc, $0412 call TextBox call Function3200 - call Function32f9 ; load regular palettes? + call SetPalettes ; load regular palettes? ret ; 0xe5bb @@ -10453,7 +10453,7 @@ Function116f8: ; 116f8 call Function1171d call WaitBGMap call WaitTop - call Function32f9 + call SetPalettes call Function11be0 ret ; 1171d @@ -12228,7 +12228,7 @@ Function124fa: ; 124fa Function1250a: ; 1250a ld b, $0 call GetSGBLayout - call Function32f9 + call SetPalettes ret ; 12513 @@ -12539,7 +12539,7 @@ endr .Clear ; 126b7 call WhiteBGMap - call Function1d7d + call Call_ExitMenu call Function2bae call .DrawMenuAccount_ call MenuFunc_1e7f @@ -12938,7 +12938,7 @@ StartMenu_Pokemon: ; 12976 callba WritePartyMenuTilemap callba PrintPartyMenuText call WaitBGMap - call Function32f9 ; load regular palettes? + call SetPalettes ; load regular palettes? call DelayFrame callba PartyMenuSelect jr c, .return ; if cancelled or pressed B @@ -13160,7 +13160,7 @@ SwitchPartyMons: ; 12aec call AddNTimes ld [hl], "▷" call WaitBGMap - call Function32f9 + call SetPalettes call DelayFrame callba PartyMenuSelect @@ -13209,7 +13209,7 @@ GiveTakePartyMonItem: ; 12b60 cp 1 jr nz, .asm_12ba0 - call Function1d6e + call LoadMenuDataHeader_0x1d75 call ClearPalettes call Function12ba9 call ClearPalettes @@ -13609,7 +13609,7 @@ UnknownText_0x12dfb: ; 0x12dfb OpenPartyStats: ; 12e00 - call Function1d6e + call LoadMenuDataHeader_0x1d75 call ClearSprites ; PartyMon xor a @@ -13617,7 +13617,7 @@ OpenPartyStats: ; 12e00 call LowVolume predef StatsScreenInit call MaxVolume - call Function1d7d + call Call_ExitMenu ld a, 0 ret ; 12e1b @@ -13788,19 +13788,19 @@ Function12f05: ; 12f05 ld a, PartyMon1MaxHP - PartyMon1 call GetPartyParamLocation ld a, [hli] - ld [hProduct], a + ld [hDividend + 0], a ld a, [hl] - ld [hMultiplicand], a + ld [hDividend + 1], a ld a, $5 - ld [hMultiplier], a + ld [hDivisor], a ld b, $2 call Divide ld a, PartyMon1HP + 1 - PartyMon1 call GetPartyParamLocation - ld a, [$ffb6] + ld a, [hQuotient + 2] sub [hl] dec hl - ld a, [$ffb5] + ld a, [hQuotient + 1] sbc [hl] ret ; 12f26 @@ -14200,7 +14200,7 @@ Function131ef: ; 131ef hlcoord 10, 4 predef Function50c50 call WaitBGMap - call Function32f9 + call SetPalettes ld a, [wd0eb] inc a ld [wcfa3], a @@ -14669,7 +14669,7 @@ Function134c0: ; 134c0 ; 134dd Function134dd: ; 134dd - call Function1d6e + call LoadMenuDataHeader_0x1d75 ld hl, Elevator_WhichFloorText call PrintText call Elevator_GetCurrentFloorText @@ -18049,7 +18049,7 @@ UnknownText_0x157cc: ; 0x157cc ; 0x157d1 KrisWithdrawItemMenu: ; 0x157d1 - call Function1d6e + call LoadMenuDataHeader_0x1d75 callba ClearPCItemScreen .asm_157da call Function15985 @@ -18128,7 +18128,7 @@ Function157e9: ; 0x157e9 KrisTossItemMenu: ; 0x1585f - call Function1d6e + call LoadMenuDataHeader_0x1d75 callba ClearPCItemScreen .asm_15868 call Function15985 @@ -18165,7 +18165,7 @@ KrisDepositItemMenu: ; 0x1588b call Function158b8 jr c, .asm_158b6 call Function2ed3 - call Function1d6e + call LoadMenuDataHeader_0x1d75 callba Function106a5 .asm_1589c callba Function106be @@ -18469,7 +18469,7 @@ MartDialog: ; 15a61 HerbShop: ; 15a6e call ReadMart - call Function1d6e + call LoadMenuDataHeader_0x1d75 ld hl, UnknownText_0x15e4a call Function15fcd call Function15c62 @@ -18483,7 +18483,7 @@ BargainShop: ; 15a84 ld de, BargainShopData call LoadMartPointer call Function15c25 - call Function1d6e + call LoadMenuDataHeader_0x1d75 ld hl, UnknownText_0x15e6d call Function15fcd call Function15c62 @@ -18502,7 +18502,7 @@ BargainShop: ; 15a84 Pharmacist: ; 15aae call ReadMart - call Function1d6e + call LoadMenuDataHeader_0x1d75 ld hl, UnknownText_0x15e90 call Function15fcd call Function15c62 @@ -18523,7 +18523,7 @@ RooftopSale: ; 15ac4 .ok call LoadMartPointer call Function15c25 - call Function1d6e + call LoadMenuDataHeader_0x1d75 ld hl, UnknownText_0x15f83 call Function15fcd call Function15c62 @@ -18608,7 +18608,7 @@ Function15b47: ; 15b47 ; 15b62 Function15b62: ; 15b62 - call Function1d6e + call LoadMenuDataHeader_0x1d75 ld hl, UnknownText_0x15f83 call PrintText ld a, $1 @@ -18661,7 +18661,7 @@ Function15ba3: ; 15ba3 ; 15baf Function15baf: ; 15baf - call Function1d6e + call LoadMenuDataHeader_0x1d75 ld hl, UnknownText_0x15fb9 call PrintText ld a, $1 @@ -19741,7 +19741,7 @@ Function16290: ; 16290 Function162a8: ; 162a8 ld hl, UnknownText_0x1665d call PrintText - call Function1d6e + call LoadMenuDataHeader_0x1d75 ld hl, MenuDataHeader_0x166b5 call CopyMenuDataHeader call InterpretMenu2 @@ -19786,7 +19786,7 @@ endr ld [hl], a ld a, $5 ld [wcf64], a - call Function1d6e + call LoadMenuDataHeader_0x1d75 call Function16517 call Function1656b call Function16571 @@ -19854,7 +19854,7 @@ endr ld [hl], a ld a, $5 ld [wcf64], a - call Function1d6e + call LoadMenuDataHeader_0x1d75 call Function16512 call Function1656b call Function16571 @@ -21219,7 +21219,7 @@ Function16be4: ; 16be4 ld b, $1c call GetSGBLayout - call Function32f9 + call SetPalettes .asm_16c6b call Functiona57 @@ -21646,7 +21646,7 @@ Function16f3e:: ; 16f3e OverworldHatchEgg:: ; 16f5e call ResetWindow - call Function1d6e + call LoadMenuDataHeader_0x1d75 call Function16f70 call Function2b4d call RestartMapMusic @@ -22127,7 +22127,7 @@ Function17254: ; 17254 (5:7254) predef FillBox pop af call Function17363 - call Function32f9 + call SetPalettes jp WaitBGMap Function1727f: ; 1727f (5:727f) @@ -22488,7 +22488,7 @@ Function20021: ; 20021 (8:4021) ld a, [hl] push af set 4, [hl] - call Function1d6e + call LoadMenuDataHeader_0x1d75 call ClearTileMap ld hl, UnknownText_0x2004c call PrintText @@ -25536,7 +25536,7 @@ Function2513b: ; 2513b (9:513b) call WaitBGMap ld b, $15 call GetSGBLayout - call Function32f9 + call SetPalettes call WaitBGMap ld hl, wcf63 xor a @@ -26719,7 +26719,7 @@ Function2695b: ; 2695b ld d, 0 add hl, de ld [hl], -1 - call Function1d6e + call LoadMenuDataHeader_0x1d75 ld hl, MenuDataHeader_0x269c5 call CopyMenuDataHeader xor a @@ -27816,9 +27816,9 @@ Function2715c: ; 2715c callba Function3ed9f call ClearSGB call WriteBackup - call Function1d6e + call LoadMenuDataHeader_0x1d75 call WaitBGMap - jp Function32f9 + jp SetPalettes ; 27192 Function27192: ; 27192 @@ -29278,7 +29278,7 @@ Function2891c: ; 2891c ; 28926 Function28926: ; 28926 - call Function309d + call LoadTileMapToTempTileMap ld a, [wcfa9] push af hlcoord 0, 15 @@ -29319,7 +29319,7 @@ Function28926: ; 28926 .asm_28983 pop af ld [wcfa9], a - call Function30b4 + call Call_LoadTempTileMapToTileMap jp Function2888b .asm_2898d @@ -29357,7 +29357,7 @@ Function28926: ; 28926 ld [wd263], a callab Function50db9 callba Function4d319 - call Function30b4 + call Call_LoadTempTileMapToTileMap hlcoord 6, 1 ld bc, $0601 ld a, $7f @@ -29597,7 +29597,7 @@ Function28b87: ; 28b87 ld hl, UnknownText_0x28eb8 bccoord 1, 14 call PlaceWholeStringInBoxAtOnce - call Function1d6e + call LoadMenuDataHeader_0x1d75 hlcoord 10, 7 ld b, $3 ld c, $7 @@ -29626,7 +29626,7 @@ Function28b87: ; 28b87 callba Function4d354 call Function1bd3 push af - call Function1d7d + call Call_ExitMenu call Function3200 pop af bit 1, a @@ -29939,7 +29939,7 @@ Function28ef8: ; 28ef8 Function28eff: ; 28eff callba Function16d6a7 - call Function32f9 + call SetPalettes ret ; 28f09 @@ -32429,7 +32429,7 @@ endr CheckRepelEffect:: ; 2a1df ; If there is no active Repel, there's no need to be here. - ld a, [wdca1] + ld a, [RepelStepsLeft] and a jr z, .encounter ; Get the first Pokemon in your party that isn't fainted. @@ -33198,13 +33198,13 @@ Function2b9a6: ; 2b9a6 jr z, .asm_2b9d7 dec hl xor a - ld [hProduct], a + ld [hDividend + 0], a ld a, [hli] - ld [hMultiplicand], a + ld [hDividend + 1], a ld a, [hli] - ld [$ffb5], a + ld [hDividend + 2], a xor a - ld [$ffb6], a + ld [hDividend + 3], a ld a, [hli] ld b, a ld a, [hld] @@ -33212,13 +33212,13 @@ Function2b9a6: ; 2b9a6 rr a srl b rr a - ld [hMultiplier], a + ld [hDivisor], a ld b, $4 call Divide - ld a, [$ffb6] + ld a, [hQuotient + 2] add e ld e, a - ld a, [$ffb5] + ld a, [hQuotient + 1] adc d ld d, a dec hl @@ -33555,7 +33555,7 @@ Function2c1b2: ; 2c1b2 callba Function2c10d ld b, $8 call GetSGBLayout - call Function32f9 + call SetPalettes ld a, $e4 ld [rOBP0], a ret @@ -34094,7 +34094,7 @@ Function2c80a: ; 2c80a callba WritePartyMenuTilemap callba PrintPartyMenuText call WaitBGMap - call Function32f9 + call SetPalettes call DelayFrame callba PartyMenuSelect push af @@ -36299,7 +36299,7 @@ AIChooseMove: ; 440ce ret nz ; No use picking a move if there's no choice. - callba Function3e8d1 + callba CheckSubstatus_RechargeChargedRampageBideRollout ret nz @@ -37109,7 +37109,7 @@ Function44781: ; 44781 _KrisMailBoxMenu: ; 0x447a0 call InitMail jr z, .nomail - call Function1d6e + call LoadMenuDataHeader_0x1d75 call Function44806 jp WriteBackup @@ -37303,7 +37303,7 @@ Function4484a: ; 0x4484a callba WritePartyMenuTilemap callba PrintPartyMenuText call WaitBGMap - call Function32f9 + call SetPalettes call DelayFrame callba PartyMenuSelect jr c, .asm_44939 @@ -37522,7 +37522,7 @@ Function4802f: ; 4802f (12:402f) call PlaceString call Function48187 call Function3200 - call Function32f9 + call SetPalettes call Function1bc9 ld hl, wcfa9 ld b, [hl] @@ -39208,11 +39208,11 @@ Function48d4a: ; 48d4a (12:4d4a) Function48d94: ; 48d94 (12:4d94) xor a ld [hDividend + 0], a - ld [hQuotient], a ; $ff00+$b4 (aliases: hMultiplicand) + ld [hDividend + 1], a ; $ff00+$b4 (aliases: hMultiplicand) ld a, [hli] ld [hDividend + 0], a ld a, [hl] - ld [hQuotient], a ; $ff00+$b4 (aliases: hMultiplicand) + ld [hDividend + 1], a ; $ff00+$b4 (aliases: hMultiplicand) ld a, 100 ld [hDivisor], a ; $ff00+$b7 (aliases: hMultiplier) ld b, 2 @@ -39237,15 +39237,15 @@ Function48d94: ; 48d94 (12:4d94) ld [hl], a ret -Function48dcb: ; 48dcb (12:4dcb) +AreYouABoyOrAreYouAGirl_Menu: ; 48dcb (12:4dcb) call Function48e14 call Function48e47 call Function48e64 call Function3200 - call Function32f9 - ld hl, UnknownText_0x48e0f + call SetPalettes + ld hl, TextJump_AreYouABoyOrAreYouAGirl call PrintText - ld hl, MenuDataHeader_0x48dfc + ld hl, MenuDataHeader_BoyGirl call LoadMenuDataHeader call Function3200 call InterpretMenu2 @@ -39258,24 +39258,24 @@ Function48dcb: ; 48dcb (12:4dcb) ret ; 48dfc (12:4dfc) -MenuDataHeader_0x48dfc: ; 0x48dfc +MenuDataHeader_BoyGirl: ; 0x48dfc db $40 ; flags db 04, 06 ; start coords db 09, 12 ; end coords - dw MenuData2_0x48e04 + dw MenuData2_BoyGirl db 1 ; default option ; 0x48e04 -MenuData2_0x48e04: ; 0x48e04 +MenuData2_BoyGirl: ; 0x48e04 db $a1 ; flags db 2 ; items db "Boy@" db "Girl@" ; 0x48e0f -UnknownText_0x48e0f: ; 0x48e0f +TextJump_AreYouABoyOrAreYouAGirl: ; 0x48e0f ; Are you a boy? Or are you a girl? - text_jump UnknownText_0x1c0ca3 + text_jump Text_AreYouABoyOrAreYouAGirl db "@" ; 0x48e14 @@ -40456,7 +40456,7 @@ MainMenu: ; 49cdc call Function49ed0 ld b, $8 call GetSGBLayout - call Function32f9 + call SetPalettes ld hl, GameTimerPause res 0, [hl] call Function49da4 @@ -40837,7 +40837,7 @@ Function49f16: ; 49f16 hlcoord 1, 14 call PlaceString call Function3200 - call Function32f9 + call SetPalettes call Function1bc9 ld hl, wcfa9 ld b, [hl] @@ -40982,9 +40982,9 @@ Function4a098: ; 4a098 (12:6098) call Function1ff8 call Function1bee call WaitBGMap - call Function1d6e + call LoadMenuDataHeader_0x1d75 callba Function89de0 - call Function1d7d + call Call_ExitMenu call Function49351 call Function4a485 pop bc @@ -41093,7 +41093,7 @@ Function4a149: ; 4a149 (12:6149) hlcoord 1, 14 call PlaceString callba Function104148 - call Function32f9 + call SetPalettes call Function1bc9 ld hl, wcfa9 ld b, [hl] @@ -41201,7 +41201,7 @@ Function4a28a: ; 4a28a (12:628a) call Function4a6d8 call Function1bee call WaitBGMap - call Function1d6e + call LoadMenuDataHeader_0x1d75 ld a, $5 call GetSRAMBank ld a, [$aa4b] @@ -41231,7 +41231,7 @@ Function4a28a: ; 4a28a (12:628a) .asm_4a2df callba Function11765d call WhiteBGMap - call Function1d7d + call Call_ExitMenu call Functione5f scf ret @@ -41265,7 +41265,7 @@ Function4a28a: ; 4a28a (12:628a) .asm_4a338 call ExitMenu .asm_4a33b - call Function1d7d + call Call_ExitMenu callba Function104148 xor a ret @@ -41342,7 +41342,7 @@ Function4a39a: ; 4a39a call Function4a485 call Function4a492 call Function4a3aa - call Function32f9 + call SetPalettes ret ; 4a3a7 @@ -41522,7 +41522,7 @@ Function4a4c4: ; 4a4c4 (12:64c4) hlcoord 1, 16 call PlaceString call Function3200 - call Function32f9 + call SetPalettes call Function1bc9 ld hl, wcfa9 ld b, [hl] @@ -42166,7 +42166,7 @@ Function4a94e: ; 4a94e ld [wd019], a ld b, $14 call GetSGBLayout - call Function32f9 + call SetPalettes call Function4aa22 jr c, .asm_4a985 jr z, .asm_4a9a1 @@ -42297,7 +42297,7 @@ Function4aa34: ; 4aa34 callba PrintPartyMenuText call Function4aab6 call WaitBGMap - call Function32f9 + call SetPalettes call DelayFrame call Function4ab1a jr z, .asm_4aa66 @@ -45189,7 +45189,7 @@ Function4dfb6: ; 4dfb6 (13:5fb6) ld hl, wcf64 bit 4, [hl] jr nz, .asm_4dfd6 - call Function32f9 + call SetPalettes ret .asm_4dfd6 call Function4e226 @@ -45502,14 +45502,14 @@ Function4e226: ; 4e226 (13:6226) jr .asm_4e246 .asm_4e238 call Function4e271 - call Function32f9 + call SetPalettes ret .asm_4e23f call Function4e253 - call Function32f9 + call SetPalettes ret .asm_4e246 - call Function32f9 + call SetPalettes call Function4e253 ld a, [CurPartySpecies] call PlayCry2 @@ -45693,7 +45693,7 @@ EggStatsScreen: ; 4e33a call PlaceString ld hl, wcf64 set 5, [hl] - call Function32f9 ; pals + call SetPalettes ; pals call DelayFrame hlcoord 0, 0 call Function3786 @@ -46336,7 +46336,7 @@ Function4e881: ; 4e881 ld hl, UnknownText_0x4e8bd call PrintText call Function3200 - call Function32f9 + call SetPalettes ret ; 4e8bd @@ -46376,7 +46376,7 @@ Function4e8c2: ; 4e8c2 ld [hSCX], a call EnableLCD call Function3200 - call Function32f9 + call SetPalettes ret ; 4e906 @@ -46694,7 +46694,7 @@ SelectMonFromParty: ; 50000 call WhiteBGMap call Function5003f call WaitBGMap - call Function32f9 + call SetPalettes call DelayFrame call PartyMenuSelect call Function2b74 @@ -46711,7 +46711,7 @@ Function5001d: ; 5001d call WaitBGMap ld b, $a call GetSGBLayout - call Function32f9 + call SetPalettes call DelayFrame call PartyMenuSelect call Function2b74 @@ -47767,7 +47767,7 @@ Function5067b: ; 5067b ld a, [PartyCount] cp [hl] jr nz, .asm_50682 - predef Function3d873 + predef CheckPlayerPartyForFitPkmn ld a, d ld [ScriptVar], a ret @@ -48922,15 +48922,15 @@ endr ld a, [hli] and $f - ld [hMultiplier], a + ld [hDivisor], a ld b, $4 call Divide - ld a, [hMultiplicand + 0] + ld a, [hQuotient + 0] push af - ld a, [hMultiplicand + 1] + ld a, [hQuotient + 1] push af - ld a, [hMultiplicand + 2] + ld a, [hQuotient + 2] push af call Function50eed @@ -53311,11 +53311,11 @@ Function84560: ; 84560 ld [hl], $4 xor a ld [hBGMapMode], a - call Function309d + call LoadTileMapToTempTileMap callba Function16dac ld a, $0 call Function84419 - call Function30b4 + call Call_LoadTempTileMapToTileMap call Function84742 ld a, $9 ld [wcf65], a @@ -53343,7 +53343,7 @@ Function84560: ; 84560 pop af ld [hVBlank], a call Function84411 - call Function30b4 + call Call_LoadTempTileMapToTileMap xor a ld [rIF], a pop af @@ -53476,13 +53476,13 @@ Function84688: ; 84688 call Function84411 ld c, $c call DelayFrames - call Function309d + call LoadTileMapToTempTileMap xor a ld [hBGMapMode], a callba Function1dd7ae ld a, $3 call Function84419 - call Function30b4 + call Call_LoadTempTileMapToTileMap call Function84742 ld a, $9 ld [wcf65], a @@ -54253,7 +54253,7 @@ endr ld [hBGMapMode], a ld b, $1a call GetSGBLayout - call Function32f9 + call SetPalettes call Function86635 xor a ld [wc2c6], a @@ -54391,7 +54391,7 @@ Function86692: ; 86692 call WaitBGMap ld b, $1a call GetSGBLayout - call Function32f9 + call SetPalettes decoord 6, 5 ld c, $6 predef Functiond066e @@ -54552,7 +54552,7 @@ Function86810: ; 86810 ld [CurPartySpecies], a ld b, $1a call GetSGBLayout - call Function32f9 + call SetPalettes call Function86635 xor a ld [wc2c6], a @@ -54643,7 +54643,7 @@ UnknownText_0x88013: ; 0x88013 ; 0x88018 Function88018: ; 88018 - call Function1d6e + call LoadMenuDataHeader_0x1d75 ld c, $1 xor a ld [wd0e4], a @@ -54672,7 +54672,7 @@ Function88018: ; 88018 call Function88161 .asm_88051 - call Function1d7d + call Call_ExitMenu ret ; 88055 @@ -55970,7 +55970,7 @@ Function894ca: ; 894ca (22:54ca) call Function895c7 call Function8949c call Function8a60d - call Function32f9 + call SetPalettes pop bc ret @@ -56622,7 +56622,7 @@ Function89844: ; 89844 call Function897af push bc call Function3200 - call Function32f9 + call SetPalettes pop bc ret ; 89856 @@ -57131,9 +57131,9 @@ Function89b28: ; 89b28 (22:5b28) call Function891de call WhiteBGMap call Function893e2 - call Function1d7d + call Call_ExitMenu call Function891ab - call Function32f9 + call SetPalettes ret Function89b3b: ; 89b3b (22:5b3b) @@ -57482,7 +57482,7 @@ Function89d0d: ; 89d0d (22:5d0d) call CopyBytes pop af ld [rSVBK], a ; $ff00+$70 - call Function32f9 + call SetPalettes callba Function845db call Function89240 ld c, $18 @@ -57688,7 +57688,7 @@ Function89e6f: ; 89e6f (22:5e6f) hlcoord 10, 4, AttrMap call Function8a5a3 call Function891ab - call Function32f9 + call SetPalettes jp Function89e36 Function89e9a: ; 89e9a (22:5e9a) @@ -57725,7 +57725,7 @@ Function89eb9: ; 89eb9 (22:5eb9) hlcoord 10, 4, AttrMap call Function8a5a3 call Function891ab - call Function32f9 + call SetPalettes jp Function89e36 Function89ee1: ; 89ee1 (22:5ee1) @@ -57906,7 +57906,7 @@ Function89fce: ; 89fce (22:5fce) hlcoord 10, 4, AttrMap call Function8a5a3 call Function89448 - call Function32f9 + call SetPalettes call Function891ab jp Function89e36 @@ -58242,7 +58242,7 @@ UnknownText_0x8a23c: ; 0x8a23c ; 0x8a241 Function8a241: ; 8a241 (22:6241) - call Function1d6e + call LoadMenuDataHeader_0x1d75 call Function891fe call Function8a262 jr nc, .asm_8a254 @@ -58253,7 +58253,7 @@ Function8a241: ; 8a241 (22:6241) .asm_8a254 call Function891de call WhiteBGMap - call Function1d7d + call Call_ExitMenu call Function891de and a ret @@ -58280,7 +58280,7 @@ Function8a262: ; 8a262 (22:6262) call Function8b36c call Function8b493 call Function891ab - call Function32f9 + call SetPalettes call Function8b5e7 ret @@ -58378,7 +58378,7 @@ Function8a31c: ; 8a31c (22:631c) call Function8a4d3 call Function8a4fc call Function891ab - call Function32f9 + call SetPalettes call Function8a383 jr c, .asm_8a370 jr z, .asm_8a34e @@ -58770,7 +58770,7 @@ Palette_8a624: ; 8a624 ; 8a62c Function8a62c: ; 8a62c (22:662c) - call Function1d6e + call LoadMenuDataHeader_0x1d75 call Function891fe xor a call Function8b94a @@ -59200,7 +59200,7 @@ Function8a999: ; 8a999 (22:6999) jr c, .asm_8a9bb push bc push de - call Function1d6e + call LoadMenuDataHeader_0x1d75 pop de dec e ld a, e @@ -59456,7 +59456,7 @@ Function8ab77: ; 8ab77 (22:6b77) Function8ab93: ; 8ab93 (22:6b93) call WhiteBGMap - call Function1d6e + call LoadMenuDataHeader_0x1d75 callba Function105688 call ClearSprites call Function891fe @@ -61317,7 +61317,7 @@ Function8b677: ; 8b677 call Function8b6ed call EnableLCD call Function891ab - call Function32f9 + call SetPalettes ret ; 8b690 @@ -68766,7 +68766,7 @@ Special_SetDayOfWeek: ; 90913 hlcoord 0, 12 ld bc, $0412 call TextBox - call Function1d6e + call LoadMenuDataHeader_0x1d75 ld hl, UnknownText_0x90a3f call PrintText hlcoord 9, 3 @@ -68862,7 +68862,7 @@ Function909de: ; 909de ld a, [wd002] ld e, a ld d, 0 - ld hl, Unknown_909f2 + ld hl, WeekdaysStrings rept 2 add hl, de endr @@ -68874,7 +68874,7 @@ endr ret ; 909f2 -Unknown_909f2: ; 909f2 +WeekdaysStrings: ; 909f2 dw Sunday dw Monday dw Tuesday @@ -68934,13 +68934,13 @@ UnknownText_0x90a6c: ; 90a6c ld c, a decoord 1, 14 callba Function1dd6bb - ld hl, UnknownText_0x90a83 + ld hl, TextJump_DSTIsThatOK ret ; 90a83 (24:4a83) -UnknownText_0x90a83: ; 0x90a83 +TextJump_DSTIsThatOK: ; 0x90a83 ; DST, is that OK? - text_jump UnknownText_0x1c5fde + text_jump Text_DSTIsThatOK db "@" ; 0x90a88 @@ -69192,7 +69192,7 @@ Function90bea: ; 90bea (24:4bea) call Function90da8 ld b, $2 call GetSGBLayout - call Function32f9 + call SetPalettes ld a, [hCGB] and a ret z @@ -70979,7 +70979,7 @@ Function9191c: ; 9191c ld [wd005], a ld b, $2 call GetSGBLayout - call Function32f9 + call SetPalettes ld a, [hCGB] and a jr z, .asm_9198b @@ -71233,7 +71233,7 @@ _FlyMap: ; 91af3 call Function91c8f ld b, $2 call GetSGBLayout - call Function32f9 + call SetPalettes .loop call Functiona57 ld hl, hJoyPressed @@ -71655,7 +71655,7 @@ Function91d11: ; 91d11 call TownMapBGUpdate ld b, $2 call GetSGBLayout - call Function32f9 + call SetPalettes xor a ld [hBGMapMode], a xor a @@ -72165,7 +72165,7 @@ Function92311: ; 92311 ld [wd004], a ld b, $2 call GetSGBLayout - call Function32f9 + call SetPalettes .loop call Functiona57 ld hl, hJoyPressed @@ -75308,7 +75308,7 @@ Functionb9237: ; b9237 ld a, [wd1ec] ld e, a callba Function8cb4 - call Function32f9 + call SetPalettes xor a ld [hJoyPressed], a call Functionb929a @@ -76516,7 +76516,7 @@ Functioncc000: ; cc000 call WaitBGMap ld b, $8 call GetSGBLayout - call Function32f9 + call SetPalettes ret ; cc0a7 @@ -80086,7 +80086,7 @@ BillsPCDepositFuncDeposit: ; e24a9 (38:64a9) ret BillsPCDepositFuncStats: ; e24c8 (38:64c8) - call Function1d6e + call LoadMenuDataHeader_0x1d75 call Functione2f7e call ExitMenu call PCMonInfo @@ -80105,7 +80105,7 @@ BillsPCDepositFuncRelease: ; e24e0 (38:64e0) push af ld de, String_e34f4 call Functione2a6e - call Function1d6e + call LoadMenuDataHeader_0x1d75 lb bc, 14, 11 call PlaceYesNoBox ld a, [wcfa9] @@ -80351,7 +80351,7 @@ BillsPCWithdrawFuncWithdraw: ; e26a1 (38:66a1) ret BillsPCWithdrawFuncStats: ; e26c0 (38:66c0) - call Function1d6e + call LoadMenuDataHeader_0x1d75 call Functione2f7e call ExitMenu call PCMonInfo @@ -80368,7 +80368,7 @@ BillsPCWithdrawFuncRelease: ; e26d8 (38:66d8) jr c, .asm_e2720 ld de, String_e34f4 call Functione2a6e - call Function1d6e + call LoadMenuDataHeader_0x1d75 lb bc, 14, 11 call PlaceYesNoBox ld a, [wcfa9] @@ -80611,7 +80611,7 @@ Functione2887: ; e2887 ; e28a5 Functione28a5: ; e28a5 - call Function1d6e + call LoadMenuDataHeader_0x1d75 call Functione2f7e call ExitMenu call PCMonInfo @@ -82246,7 +82246,7 @@ String_e3597: db "No releasing EGGS!@" ; e35aa Functione35aa: ; e35aa (38:75aa) - call Function1d6e + call LoadMenuDataHeader_0x1d75 call Functione35e2 .asm_e35b0 xor a @@ -82606,7 +82606,7 @@ _OptionsMenu: ; e41d0 call WaitBGMap ld b, $8 call GetSGBLayout - call Function32f9 + call SetPalettes .asm_e4217 call Functiona57 ld a, [hJoyPressed] @@ -83173,7 +83173,7 @@ Functione4579: ; e4579 call WaitBGMap ld b, $19 call GetSGBLayout - call Function32f9 + call SetPalettes ld c, 10 call DelayFrames callab Copyright @@ -86290,7 +86290,7 @@ Functionfb8c8: ; fb8c8 ld [TempMonDVs + 1], a ld b, $1c call GetSGBLayout - call Function32f9 + call SetPalettes ret ; fb8f1 @@ -89040,7 +89040,7 @@ DoMysteryGift: ; 1048ba (41:48ba) call WaitBGMap ld b, $8 call GetSGBLayout - call Function32f9 + call SetPalettes pop de hlcoord 2, 8 ld a, d @@ -90340,7 +90340,7 @@ Function105153: ; 105153 (41:5153) call WaitBGMap ld b, $1d call GetSGBLayout - call Function32f9 + call SetPalettes ret Function10522e: ; 10522e (41:522e) @@ -90518,7 +90518,7 @@ Function105777: ; 105777 (41:5777) call WaitBGMap ld b, $8 call GetSGBLayout - call Function32f9 + call SetPalettes ret Function10578c: ; 10578c (41:578c) @@ -90643,7 +90643,7 @@ Function1057d7: ; 1057d7 (41:57d7) call WaitBGMap ld b, $2 callba Function4930f - jp Function32f9 + jp SetPalettes Function1058c6: ; 1058c6 (41:58c6) ld b, $6 @@ -91778,10 +91778,11 @@ endr ld [$ffbb], a ret -Function1062f7 +Function1062f7: ld a, [$ffbc] bit 7, a ret z + ld [hl], $f6 ret ; 1062ff @@ -92487,7 +92488,7 @@ Function1dc381: ; 1dc381 call WaitBGMap ld b, $3 call GetSGBLayout - call Function32f9 + call SetPalettes ret ; 1dc47b @@ -92539,7 +92540,7 @@ Function1dc47b: ; 1dc47b call WaitBGMap ld b, $3 call GetSGBLayout - call Function32f9 + call SetPalettes ret ; 1dc507 @@ -92681,18 +92682,18 @@ Function1dd6bb: ; 1dd6bb (77:56bb) ld bc, $8102 call PrintNum pop bc - ld de, String_1dd6fc + ld de, String_AM pop af jr c, .asm_1dd6f7 - ld de, String_1dd6ff + ld de, String_PM .asm_1dd6f7 inc hl call PlaceString ret ; 1dd6fc (77:56fc) -String_1dd6fc: db "AM@" -String_1dd6ff: db "PM@" +String_AM: db "AM@" ; 1dd6fc +String_PM: db "PM@" ; 1dd6ff ; 1dd702 @@ -92870,22 +92871,22 @@ Function1de27f: ; 1de27f -Function1de28a:: ; 1de28a +Start_DudeAutoInput_A:: ; 1de28a ld hl, DudeAutoInput_A - jr Function1de299 + jr CallStartAutoInput ; 1de28f -Function1de28f: ; 1de28f +Start_DudeAutoInput_RightA: ; 1de28f ld hl, DudeAutoInput_RightA - jr Function1de299 + jr CallStartAutoInput ; 1de294 -Function1de294: ; 1de294 +Start_DudeAutoInput_DownA: ; 1de294 ld hl, DudeAutoInput_DownA - jr Function1de299 + jr CallStartAutoInput ; 1de299 -Function1de299: ; 1de299 +CallStartAutoInput: ; 1de299 ld a, BANK(DudeAutoInputs) call StartAutoInput ret |