diff options
author | JimB16 <f1@jimb.de> | 2015-09-12 04:21:00 +0200 |
---|---|---|
committer | JimB16 <f1@jimb.de> | 2015-09-12 04:21:00 +0200 |
commit | 0001c688d35d006d178ac892b1adef887a8b0796 (patch) | |
tree | 5f6d3683d74130ba9d7ba6ccee892705704eb530 | |
parent | 8ccdd4d6c05e6a6ca645011b170828851e82cc60 (diff) |
found functions that determine next OTPkmn
-rw-r--r-- | battle/ai/scoring.asm | 14 | ||||
-rw-r--r-- | battle/core.asm | 58 | ||||
-rw-r--r-- | battle/effect_commands.asm | 14 | ||||
-rw-r--r-- | engine/pack.asm | 42 | ||||
-rw-r--r-- | engine/save.asm | 2 | ||||
-rw-r--r-- | event/move_deleter.asm | 2 | ||||
-rw-r--r-- | home/map.asm | 2 | ||||
-rw-r--r-- | home/menu.asm | 2 | ||||
-rw-r--r-- | main.asm | 108 | ||||
-rw-r--r-- | misc/crystal_misc.asm | 2 | ||||
-rw-r--r-- | misc/mobile_40.asm | 4 | ||||
-rw-r--r-- | misc/mobile_45.asm | 4 | ||||
-rw-r--r-- | text/common_3.asm | 8 |
13 files changed, 137 insertions, 125 deletions
diff --git a/battle/ai/scoring.asm b/battle/ai/scoring.asm index 27bc417e9..64da1a982 100644 --- a/battle/ai/scoring.asm +++ b/battle/ai/scoring.asm @@ -176,7 +176,7 @@ AI_Types: ; 38635 push de ld a, 1 ld [hBattleTurn], a - callab Function347c8 + callab HowEffectiveIsTheMovetypeAgainstTheEnemyPkmn pop de pop bc pop hl @@ -431,7 +431,7 @@ AI_Smart_LeechHit: ; 387f7 push hl ld a, 1 ld [hBattleTurn], a - callab Function347c8 + callab HowEffectiveIsTheMovetypeAgainstTheEnemyPkmn pop hl ; 60% chance to discourage this move if not very effective. @@ -512,7 +512,7 @@ AI_Smart_LockOn: ; 3881d push hl push bc - callba Function347c8 + callba HowEffectiveIsTheMovetypeAgainstTheEnemyPkmn ld a, [wd265] cp $a pop bc @@ -1384,7 +1384,7 @@ AI_Smart_Mimic: ; 38ba8 ld a, $1 ld [hBattleTurn], a - callab Function347c8 + callab HowEffectiveIsTheMovetypeAgainstTheEnemyPkmn ld a, [wd265] cp $a @@ -1830,7 +1830,7 @@ AI_Smart_Conversion2: ; 38d98 xor a ld [hBattleTurn], a - callab Function347c8 + callab HowEffectiveIsTheMovetypeAgainstTheEnemyPkmn ld a, [wd265] cp $a @@ -2496,7 +2496,7 @@ AI_Smart_HiddenPower: ; 3909e ; Calculate Hidden Power's type and base power based on enemy's DVs. callab HiddenPowerDamage - callab Function347c8 + callab HowEffectiveIsTheMovetypeAgainstTheEnemyPkmn pop hl ; Discourage Hidden Power if not very effective. @@ -3498,7 +3498,7 @@ AI_Status: ; 39453 push de ld a, 1 ld [hBattleTurn], a - callab Function347c8 + callab HowEffectiveIsTheMovetypeAgainstTheEnemyPkmn pop de pop bc pop hl diff --git a/battle/core.asm b/battle/core.asm index 1db6793af..f4002107c 100644 --- a/battle/core.asm +++ b/battle/core.asm @@ -2875,7 +2875,7 @@ Function3d1f8: ; 3d1f8 Function3d227: ; 3d227 call EmptyBattleTextBox - call Function1d6e + call LoadMenuDataHeader_0x1d75 call Function3d2f7 call ForcePickPartyMonInBattle ld a, [InLinkBattle] @@ -3289,11 +3289,11 @@ Function3d4ae: ; 3d4ae Function3d4c3: ; 3d4c3 - call Function3d557 + call ResetEnemyBattleVars ld a, [wc718] dec a ld b, a - call Function3d6ca + call LoadEnemyPkmnToSwitchTo call Function3d7a0 call NewEnemyMonStatus call ResetEnemyStatLevels @@ -3307,12 +3307,12 @@ Function3d4c3: ; 3d4c3 Function3d4e1: ; 3d4e1 call Function3d714 jr nc, Function3d517 - call Function3d557 + call ResetEnemyBattleVars call Function3d533 jr c, .asm_3d4f1 - call Function3d599 + call FindPkmnInOTPartyToSwitchIntoBattle .asm_3d4f1 - call Function3d6ca + call LoadEnemyPkmnToSwitchTo call Function3d74b push af call Function3d7a0 @@ -3331,12 +3331,13 @@ Function3d4e1: ; 3d4e1 ; 3d517 Function3d517: ; 3d517 - call Function3d557 + call ResetEnemyBattleVars call Function3d533 jr c, .asm_3d522 - call Function3d599 + call FindPkmnInOTPartyToSwitchIntoBattle .asm_3d522 - call Function3d6ca + ; 'b' contains the PartyNr of the Pkmn the AI will switch to + call LoadEnemyPkmnToSwitchTo ld a, 1 ld [wEnemyIsSwitching], a call Function3d7a0 @@ -3345,6 +3346,7 @@ Function3d517: ; 3d517 ; 3d533 Function3d533: ; 3d533 +; returns carry if: ??? ld a, [InLinkBattle] and a jr z, .asm_3d541 @@ -3358,6 +3360,7 @@ Function3d533: ; 3d533 ld a, [wc718] and a jr z, .asm_3d54b + dec a ld b, a jr .asm_3d555 @@ -3367,6 +3370,7 @@ Function3d533: ; 3d533 and a ld b, $0 jr nz, .asm_3d555 + and a ret @@ -3375,7 +3379,8 @@ Function3d533: ; 3d533 ret ; 3d557 -Function3d557: ; 3d557 +ResetEnemyBattleVars: ; 3d557 +; and draw empty TextBox xor a ld [LastEnemyCounterMove], a ld [LastPlayerCounterMove], a @@ -3389,7 +3394,7 @@ Function3d557: ; 3d557 ld a, $8 call Function3d490 call EmptyBattleTextBox - jp Function1d6e + jp LoadMenuDataHeader_0x1d75 ; 3d57a Function3d57a: ; 3d57a @@ -3408,7 +3413,7 @@ Function3d581: ; 3d581 predef_jump FlagPredef ; 3d599 -Function3d599: ; 3d599 +FindPkmnInOTPartyToSwitchIntoBattle: ; 3d599 ld b, $ff ld a, $1 ld [Buffer1], a @@ -3435,8 +3440,8 @@ Function3d599: ; 3d599 or c pop bc jr z, .asm_3d5d0 - call Function3d5d7 - call Function3d618 + call LookUpTheEffectivenessOfEveryMove + call IsThePlayerPkmnTypesEffectiveAgainstOTPkmn jr .asm_3d5a3 .asm_3d5d0 @@ -3445,7 +3450,7 @@ Function3d599: ; 3d599 jr .asm_3d5a3 ; 3d5d7 -Function3d5d7: ; 3d5d7 +LookUpTheEffectivenessOfEveryMove: ; 3d5d7 push bc ld hl, OTPartyMon1Moves ld a, b @@ -3469,11 +3474,11 @@ Function3d5d7: ; 3d5d7 ld a, BANK(Moves) call FarCopyBytes call SetEnemyTurn - callab Function347c8 + callab HowEffectiveIsTheMovetypeAgainstTheEnemyPkmn pop bc pop de pop hl - ld a, [wd265] + ld a, [wd265] ; Get The Effectiveness Modifier cp 10 + 1 ; 1.0 + 0.1 jr c, .loop ld hl, Buffer1 @@ -3483,7 +3488,9 @@ Function3d5d7: ; 3d5d7 ret ; 3d618 -Function3d618: ; 3d618 +IsThePlayerPkmnTypesEffectiveAgainstOTPkmn: ; 3d618 +; Calculates the effectiveness of the types of the PlayerPkmn +; against the OTPkmn push bc ld hl, OTPartyCount ld a, b @@ -3503,13 +3510,13 @@ Function3d618: ; 3d618 ld a, [BattleMonType1] ld [wPlayerMoveStruct + MOVE_TYPE], a call SetPlayerTurn - callab Function347c8 + callab HowEffectiveIsTheMovetypeAgainstTheEnemyPkmn ld a, [wd265] cp 10 + 1 ; 1.0 + 0.1 jr nc, .asm_3d663 ld a, [BattleMonType2] ld [wPlayerMoveStruct + MOVE_TYPE], a - callab Function347c8 + callab HowEffectiveIsTheMovetypeAgainstTheEnemyPkmn ld a, [wd265] cp 10 + 1 ; 1.0 + 0.1 jr nc, .asm_3d663 @@ -3595,7 +3602,8 @@ Function3d672: ; 3d672 ret ; 3d6ca -Function3d6ca: ; 3d6ca +LoadEnemyPkmnToSwitchTo: ; 3d6ca + ; 'b' contains the PartyNr of the Pkmn the AI will switch to ld a, b ld [CurPartyMon], a ld hl, OTPartyMon1Level @@ -5203,7 +5211,7 @@ BattleMenu_Pack: ; 3e1c7 and a jp nz, ItemsCantBeUsed - call Function1d6e + call LoadMenuDataHeader_0x1d75 ld a, [BattleType] cp BATTLETYPE_TUTORIAL @@ -5298,10 +5306,10 @@ Function3e234: ; 3e234 ; 3e28d BattleMenu_PKMN: ; 3e28d - call Function1d6e + call LoadMenuDataHeader_0x1d75 Function3e290: call ExitMenu - call Function1d6e + call LoadMenuDataHeader_0x1d75 call WhiteBGMap Function3e299: call Function3d2fa @@ -5437,7 +5445,7 @@ Function3e3ad: ; 3e3ad ld a, [InLinkBattle] and a jr z, .asm_3e3c1 - call Function1d6e + call LoadMenuDataHeader_0x1d75 call Function3e8e4 call WriteBackup diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm index ea6ee17f1..86eb87bee 100644 --- a/battle/effect_commands.asm +++ b/battle/effect_commands.asm @@ -1510,7 +1510,7 @@ endr jr .asm_34743 .end - call Function347c8 + call HowEffectiveIsTheMovetypeAgainstTheEnemyPkmn ld a, [wd265] ld b, a ld a, [TypeModifier] @@ -1521,7 +1521,7 @@ endr ; 347c8 -Function347c8: ; 347c8 +HowEffectiveIsTheMovetypeAgainstTheEnemyPkmn: ; 347c8 ld hl, EnemyMonType1 ld a, [hBattleTurn] and a @@ -1599,7 +1599,7 @@ Function347d3: ; 347d3 BattleCommanda3: ; 34833 - call Function347c8 + call HowEffectiveIsTheMovetypeAgainstTheEnemyPkmn ld a, [wd265] and a ld a, 10 ; 1.0 @@ -4775,7 +4775,7 @@ BattleCommand44: ; 359e6 push hl ld a, d ld [hl], a - call Function347c8 + call HowEffectiveIsTheMovetypeAgainstTheEnemyPkmn pop hl pop af ld [hl], a @@ -9733,7 +9733,7 @@ BattleCommand67: ; 379c9 call DelayFrames ; Transition into switchmon menu - call Function1d6e + call LoadMenuDataHeader_0x1d75 callba Function3d2f7 callba ForcePickSwitchMonInBattle @@ -9807,7 +9807,7 @@ BatonPass_LinkPlayerSwitch: ; 37a67 ld a, 1 ld [wd0ec], a - call Function1d6e + call LoadMenuDataHeader_0x1d75 ld hl, Function3e8e4 call CallBattleCore call WriteBackup @@ -9823,7 +9823,7 @@ BatonPass_LinkEnemySwitch: ; 37a82 and a ret z - call Function1d6e + call LoadMenuDataHeader_0x1d75 ld hl, Function3e8e4 call CallBattleCore diff --git a/engine/pack.asm b/engine/pack.asm index f09e7d715..657a5bea3 100644 --- a/engine/pack.asm +++ b/engine/pack.asm @@ -164,7 +164,7 @@ MenuData2_0x1012c: ; 0x1012c Jumptable_10137: ; 10137 dw Function10159 - dw Function10492 + dw Function10492_ret ; 1013b MenuDataHeader_0x1013b: ; 0x1013b @@ -186,7 +186,7 @@ MenuData2_0x10143: ; 0x10143 Jumptable_10153: ; 10153 dw Function10159 dw Function103fd - dw Function10492 + dw Function10492_ret ; 10159 Function10159: ; 10159 @@ -322,7 +322,7 @@ Jumptable_1026a: ; 1026a dw Function103fd dw Function10364 dw Function103c2 - dw Function10492 + dw Function10492_ret ; 10274 MenuDataHeader_0x10274: ; 0x10274 @@ -346,7 +346,7 @@ Jumptable_10291: ; 10291 dw Function10311 dw Function103fd dw Function10364 - dw Function10492 + dw Function10492_ret ; 10299 MenuDataHeader_0x10299: ; 0x10299 @@ -366,7 +366,7 @@ MenuData2_0x102a1: ; 0x102a1 Jumptable_102ac: ; 102ac dw Function10311 - dw Function10492 + dw Function10492_ret ; 102b0 MenuDataHeader_0x102b0: ; 0x102b0 @@ -388,7 +388,7 @@ MenuData2_0x102b8: ; 0x102b8 Jumptable_102c7: ; 102c7 dw Function10311 dw Function103c2 - dw Function10492 + dw Function10492_ret ; 102cd MenuDataHeader_0x102cd: ; 0x102cd @@ -412,7 +412,7 @@ Jumptable_102ea: ; 102ea dw Function103fd dw Function10364 dw Function103c2 - dw Function10492 + dw Function10492_ret ; 102f2 MenuDataHeader_0x102f2: ; 0x102f2 @@ -434,7 +434,7 @@ MenuData2_0x102fa: ; 0x102fa Jumptable_1030b: ; 1030b dw Function103fd dw Function10364 - dw Function10492 + dw Function10492_ret ; 10311 Function10311: ; 10311 @@ -476,7 +476,7 @@ Function10338: ; 10338 (4:4338) call Function10a40 ret .asm_1034e - ld hl, UnknownText_0x10af8 + ld hl, TextJump_YouDontHaveAPkmn call Function10889 ret @@ -598,12 +598,15 @@ Function103fd: ; 103fd call DelayFrame callba PartyMenuSelect jr c, .asm_10475 + ld a, [CurPartySpecies] cp EGG jr nz, .asm_10453 - ld hl, UnknownText_0x1048d + + ld hl, TextJump_AnEGGCantHoldAnItem call PrintText jr .asm_10427 + .asm_10453 ld a, [wcf63] push af @@ -630,18 +633,18 @@ Function103fd: ; 103fd ret Function10486: ; 10486 (4:4486) - ld hl, UnknownText_0x10af8 + ld hl, TextJump_YouDontHaveAPkmn call Function10889 ret ; 1048d (4:448d) -UnknownText_0x1048d: ; 0x1048d +TextJump_AnEGGCantHoldAnItem: ; 0x1048d ; An EGG can't hold an item. - text_jump UnknownText_0x1c0b7f + text_jump Text_AnEGGCantHoldAnItem db "@" ; 0x10492 -Function10492: ; 10492 +Function10492_ret: ; 10492 ret ; 10493 @@ -1650,9 +1653,9 @@ UnknownText_0x10af3: ; 0x10af3 db "@" ; 0x10af8 -UnknownText_0x10af8: ; 0x10af8 +TextJump_YouDontHaveAPkmn: ; 0x10af8 ; You don't have a #MON! - text_jump UnknownText_0x1c0c17 + text_jump Text_YouDontHaveAPkmn db "@" ; 0x10afd @@ -1680,9 +1683,10 @@ UnknownText_0x10b0c: ; 0x10b0c db "@" ; 0x10b11 -UnknownText_0x10b11: ; 0x10b11 - ; You can't use it in a battle. - text_jump UnknownText_0x1c0c85 +TextJump_YouCantUseItInABattle: ; 0x10b11 + ; Doesn't seem to be used anywhere + ; "You can't use it in a battle." + text_jump Text_YouCantUseItInABattle db "@" ; 0x10b16 diff --git a/engine/save.asm b/engine/save.asm index 92b65398b..f47495b1d 100644 --- a/engine/save.asm +++ b/engine/save.asm @@ -1,5 +1,5 @@ Function14a1a: ; 14a1a - call Function1d6e + call LoadMenuDataHeader_0x1d75 callba Function5e9a call SpeechTextBox call UpdateSprites diff --git a/event/move_deleter.asm b/event/move_deleter.asm index 40456f31a..88dd234af 100644 --- a/event/move_deleter.asm +++ b/event/move_deleter.asm @@ -19,7 +19,7 @@ MoveDeletion: jr z, .asm_2c5ca ld hl, UnknownText_0x2c5ea call PrintText - call Function1d6e + call LoadMenuDataHeader_0x1d75 callba Function12f5b push af call Function2b74 diff --git a/home/map.asm b/home/map.asm index b9e77dddb..9793414e0 100644 --- a/home/map.asm +++ b/home/map.asm @@ -1955,7 +1955,7 @@ CheckStandingOnXYTrigger:: ; 2ae7 FadeToMenu:: ; 2b29 xor a ld [hBGMapMode], a - call Function1d6e + call LoadMenuDataHeader_0x1d75 callba FadeBlackBGMap call ClearSprites call Function2ed3 diff --git a/home/menu.asm b/home/menu.asm index 3f21e2c61..e299505dd 100644 --- a/home/menu.asm +++ b/home/menu.asm @@ -52,7 +52,7 @@ MenuTextBoxBackup:: ; 1d67 ret ; 1d6e -Function1d6e:: ; 1d6e +LoadMenuDataHeader_0x1d75:: ; 1d6e ld hl, MenuDataHeader_0x1d75 call LoadMenuDataHeader ret @@ -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 @@ -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] @@ -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 @@ -13673,7 +13673,7 @@ GiveTakePartyMonItem: ; 12b60 cp 1 jr nz, .asm_12ba0 - call Function1d6e + call LoadMenuDataHeader_0x1d75 call ClearPalettes call Function12ba9 call ClearPalettes @@ -14073,7 +14073,7 @@ UnknownText_0x12dfb: ; 0x12dfb OpenPartyStats: ; 12e00 - call Function1d6e + call LoadMenuDataHeader_0x1d75 call ClearSprites ; PartyMon xor a @@ -15133,7 +15133,7 @@ Function134c0: ; 134c0 ; 134dd Function134dd: ; 134dd - call Function1d6e + call LoadMenuDataHeader_0x1d75 ld hl, Elevator_WhichFloorText call PrintText call Elevator_GetCurrentFloorText @@ -18513,7 +18513,7 @@ UnknownText_0x157cc: ; 0x157cc ; 0x157d1 KrisWithdrawItemMenu: ; 0x157d1 - call Function1d6e + call LoadMenuDataHeader_0x1d75 callba ClearPCItemScreen .asm_157da call Function15985 @@ -18592,7 +18592,7 @@ Function157e9: ; 0x157e9 KrisTossItemMenu: ; 0x1585f - call Function1d6e + call LoadMenuDataHeader_0x1d75 callba ClearPCItemScreen .asm_15868 call Function15985 @@ -18629,7 +18629,7 @@ KrisDepositItemMenu: ; 0x1588b call Function158b8 jr c, .asm_158b6 call Function2ed3 - call Function1d6e + call LoadMenuDataHeader_0x1d75 callba Function106a5 .asm_1589c callba Function106be @@ -18933,7 +18933,7 @@ MartDialog: ; 15a61 HerbShop: ; 15a6e call ReadMart - call Function1d6e + call LoadMenuDataHeader_0x1d75 ld hl, UnknownText_0x15e4a call Function15fcd call Function15c62 @@ -18947,7 +18947,7 @@ BargainShop: ; 15a84 ld de, BargainShopData call LoadMartPointer call Function15c25 - call Function1d6e + call LoadMenuDataHeader_0x1d75 ld hl, UnknownText_0x15e6d call Function15fcd call Function15c62 @@ -18966,7 +18966,7 @@ BargainShop: ; 15a84 Pharmacist: ; 15aae call ReadMart - call Function1d6e + call LoadMenuDataHeader_0x1d75 ld hl, UnknownText_0x15e90 call Function15fcd call Function15c62 @@ -18987,7 +18987,7 @@ RooftopSale: ; 15ac4 .ok call LoadMartPointer call Function15c25 - call Function1d6e + call LoadMenuDataHeader_0x1d75 ld hl, UnknownText_0x15f83 call Function15fcd call Function15c62 @@ -19072,7 +19072,7 @@ Function15b47: ; 15b47 ; 15b62 Function15b62: ; 15b62 - call Function1d6e + call LoadMenuDataHeader_0x1d75 ld hl, UnknownText_0x15f83 call PrintText ld a, $1 @@ -19125,7 +19125,7 @@ Function15ba3: ; 15ba3 ; 15baf Function15baf: ; 15baf - call Function1d6e + call LoadMenuDataHeader_0x1d75 ld hl, UnknownText_0x15fb9 call PrintText ld a, $1 @@ -20205,7 +20205,7 @@ Function16290: ; 16290 Function162a8: ; 162a8 ld hl, UnknownText_0x1665d call PrintText - call Function1d6e + call LoadMenuDataHeader_0x1d75 ld hl, MenuDataHeader_0x166b5 call CopyMenuDataHeader call InterpretMenu2 @@ -20250,7 +20250,7 @@ endr ld [hl], a ld a, $5 ld [wcf64], a - call Function1d6e + call LoadMenuDataHeader_0x1d75 call Function16517 call Function1656b call Function16571 @@ -20318,7 +20318,7 @@ endr ld [hl], a ld a, $5 ld [wcf64], a - call Function1d6e + call LoadMenuDataHeader_0x1d75 call Function16512 call Function1656b call Function16571 @@ -22110,7 +22110,7 @@ Function16f3e:: ; 16f3e OverworldHatchEgg:: ; 16f5e call ResetWindow - call Function1d6e + call LoadMenuDataHeader_0x1d75 call Function16f70 call Function2b4d call RestartMapMusic @@ -22952,7 +22952,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 @@ -27183,7 +27183,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 @@ -28280,7 +28280,7 @@ Function2715c: ; 2715c callba Function3ed9f call ClearSGB call WriteBackup - call Function1d6e + call LoadMenuDataHeader_0x1d75 call WaitBGMap jp SetPalettes ; 27192 @@ -30061,7 +30061,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 @@ -37573,7 +37573,7 @@ Function44781: ; 44781 _KrisMailBoxMenu: ; 0x447a0 call InitMail jr z, .nomail - call Function1d6e + call LoadMenuDataHeader_0x1d75 call Function44806 jp WriteBackup @@ -39701,15 +39701,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 SetPalettes - ld hl, UnknownText_0x48e0f + ld hl, TextJump_AreYouABoyOrAreYouAGirl call PrintText - ld hl, MenuDataHeader_0x48dfc + ld hl, MenuDataHeader_BoyGirl call LoadMenuDataHeader call Function3200 call InterpretMenu2 @@ -39722,24 +39722,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 @@ -41446,7 +41446,7 @@ Function4a098: ; 4a098 (12:6098) call Function1ff8 call Function1bee call WaitBGMap - call Function1d6e + call LoadMenuDataHeader_0x1d75 callba Function89de0 call Call_ExitMenu call Function49351 @@ -41665,7 +41665,7 @@ Function4a28a: ; 4a28a (12:628a) call Function4a6d8 call Function1bee call WaitBGMap - call Function1d6e + call LoadMenuDataHeader_0x1d75 ld a, $5 call GetSRAMBank ld a, [$aa4b] @@ -55105,7 +55105,7 @@ UnknownText_0x88013: ; 0x88013 ; 0x88018 Function88018: ; 88018 - call Function1d6e + call LoadMenuDataHeader_0x1d75 ld c, $1 xor a ld [wd0e4], a @@ -58704,7 +58704,7 @@ UnknownText_0x8a23c: ; 0x8a23c ; 0x8a241 Function8a241: ; 8a241 (22:6241) - call Function1d6e + call LoadMenuDataHeader_0x1d75 call Function891fe call Function8a262 jr nc, .asm_8a254 @@ -59232,7 +59232,7 @@ Palette_8a624: ; 8a624 ; 8a62c Function8a62c: ; 8a62c (22:662c) - call Function1d6e + call LoadMenuDataHeader_0x1d75 call Function891fe xor a call Function8b94a @@ -59662,7 +59662,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 @@ -59918,7 +59918,7 @@ Function8ab77: ; 8ab77 (22:6b77) Function8ab93: ; 8ab93 (22:6b93) call WhiteBGMap - call Function1d6e + call LoadMenuDataHeader_0x1d75 callba Function105688 call ClearSprites call Function891fe @@ -69228,7 +69228,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 @@ -80548,7 +80548,7 @@ BillsPCDepositFuncDeposit: ; e24a9 (38:64a9) ret BillsPCDepositFuncStats: ; e24c8 (38:64c8) - call Function1d6e + call LoadMenuDataHeader_0x1d75 call Functione2f7e call ExitMenu call PCMonInfo @@ -80567,7 +80567,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] @@ -80813,7 +80813,7 @@ BillsPCWithdrawFuncWithdraw: ; e26a1 (38:66a1) ret BillsPCWithdrawFuncStats: ; e26c0 (38:66c0) - call Function1d6e + call LoadMenuDataHeader_0x1d75 call Functione2f7e call ExitMenu call PCMonInfo @@ -80830,7 +80830,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] @@ -81073,7 +81073,7 @@ Functione2887: ; e2887 ; e28a5 Functione28a5: ; e28a5 - call Function1d6e + call LoadMenuDataHeader_0x1d75 call Functione2f7e call ExitMenu call PCMonInfo @@ -82708,7 +82708,7 @@ String_e3597: db "No releasing EGGS!@" ; e35aa Functione35aa: ; e35aa (38:75aa) - call Function1d6e + call LoadMenuDataHeader_0x1d75 call Functione35e2 .asm_e35b0 xor a diff --git a/misc/crystal_misc.asm b/misc/crystal_misc.asm index 3c6ded567..45eda5c7f 100644 --- a/misc/crystal_misc.asm +++ b/misc/crystal_misc.asm @@ -410,7 +410,7 @@ Function17a91e: ; 17a91e (5e:691e) xor a ret .asm_17a92c - call Function1d6e + call LoadMenuDataHeader_0x1d75 call Function17a99e ld hl, $d088 set 7, [hl] diff --git a/misc/mobile_40.asm b/misc/mobile_40.asm index 79d982cea..85e3d85f9 100644 --- a/misc/mobile_40.asm +++ b/misc/mobile_40.asm @@ -4483,7 +4483,7 @@ Unknown_101d8d: ; 101d8d Function101d95: ; 101d95 call Function101ee2 - call Function1d6e + call LoadMenuDataHeader_0x1d75 ld e, $e call Function101ee4 ld hl, wcd29 @@ -6256,7 +6256,7 @@ Jumptable_1029cb: ; 1029cb ; 1029cf Function1029cf: ; 1029cf - call Function1d6e + call LoadMenuDataHeader_0x1d75 hlcoord 10, 7 ld b, $3 ld c, $8 diff --git a/misc/mobile_45.asm b/misc/mobile_45.asm index 1b0732f10..57837187c 100644 --- a/misc/mobile_45.asm +++ b/misc/mobile_45.asm @@ -22177,7 +22177,7 @@ Function16d42e: ; 16d42e ; 16d43b Function16d43b: ; 16d43b - call Function1d6e + call LoadMenuDataHeader_0x1d75 call WhiteBGMap call ClearTileMap call ClearSprites @@ -22327,7 +22327,7 @@ Function16d6ca: ; 16d6ca ; 16d6ce Function16d6ce: ; 16d6ce - call Function1d6e + call LoadMenuDataHeader_0x1d75 call Function16d6e1 callba Function87d call Call_ExitMenu diff --git a/text/common_3.asm b/text/common_3.asm index 81e916994..ad1846f9b 100644 --- a/text/common_3.asm +++ b/text/common_3.asm @@ -689,7 +689,7 @@ UnknownText_0x1c0b65: ; 1c0b65 done ; 1c0b7f -UnknownText_0x1c0b7f: ; 1c0b7f +Text_AnEGGCantHoldAnItem: ; 1c0b7f text "An EGG can't hold" line "an item." prompt @@ -731,7 +731,7 @@ UnknownText_0x1c0bee: ; 1c0bee prompt ; 1c0c17 -UnknownText_0x1c0c17: ; 1c0c17 +Text_YouDontHaveAPkmn: ; 1c0c17 text "You don't have a" line "#MON!" prompt @@ -762,13 +762,13 @@ UnknownText_0x1c0c83: ; 1c0c83 done ; 1c0c85 -UnknownText_0x1c0c85: ; 1c0c85 +Text_YouCantUseItInABattle: ; 1c0c85 text "You can't use it" line "in a battle." prompt ; 1c0ca3 -UnknownText_0x1c0ca3: ; 1c0ca3 +Text_AreYouABoyOrAreYouAGirl: ; 1c0ca3 text "Are you a boy?" line "Or are you a girl?" done |