diff options
Diffstat (limited to 'misc/mobile_5f.asm')
| -rw-r--r-- | misc/mobile_5f.asm | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/misc/mobile_5f.asm b/misc/mobile_5f.asm index 19c3748e8..2c1972c1a 100644 --- a/misc/mobile_5f.asm +++ b/misc/mobile_5f.asm @@ -274,35 +274,35 @@ CheckStringForErrors_IgnoreTerminator: ; 17d0b3 Function17d0f3: ; 17d0f3 ld a, [$c608 + 5] - ld [wc702], a + ld [wOTTrademonSpecies], a ld [CurPartySpecies], a ld a, [wcd81] ld [wc74e], a ld hl, $c63d - ld de, wc724 - ld bc, $0005 + ld de, wOTTrademonOTName + ld bc, 5 call CopyBytes - ld a, $50 + ld a, "@" ld [de], a ld a, [$c608 + 11] - ld [wEnemyWrapCount], a + ld [wOTTrademonID], a ld a, [$c608 + 12] - ld [wPlayerCharging], a + ld [wOTTrademonID + 1], a ld hl, $c608 + 26 ld a, [hli] - ld [wEnemyTrappingMove], a + ld [wOTTrademonDVs], a ld a, [hl] - ld [wPlayerWrapCount], a + ld [wOTTrademonDVs + 1], a ld bc, $c608 + 5 callba GetCaughtGender ld a, c - ld [wEnemyCharging], a + ld [wOTTrademonCaughtData], a call SpeechTextBox call FadeToMenu callba Function10804d callba Function17d1f1 ld a, $1 - ld [wd1e9], a + ld [wForceEvolution], a ld a, $2 ld [wLinkMode], a callba EvolvePokemon @@ -326,7 +326,7 @@ Function17d0f3: ; 17d0f3 ld [de], a .asm_17d180 - call ReturnToCallingMenu + call CloseSubmenu call RestartMapMusic ret ; 17d187 @@ -418,12 +418,12 @@ Function17d1f1: ; 17d1f1 call AddNTimes predef GetUnownLetter callab UpdateUnownDex - ld a, [wdef4] + ld a, [wFirstUnownSeen] and a jr nz, .asm_17d223 ld a, [UnownLetter] - ld [wdef4], a + ld [wFirstUnownSeen], a .asm_17d223 ret @@ -461,20 +461,20 @@ Special_Menu_ChallengeExplanationCancel: ; 17d224 ; 17d246 Function17d246: ; 17d246 - call InterpretMenu2 + call VerticalMenu jr c, .Exit ld a, [ScriptVar] cp $5 - jr nz, .UseMenuSelection2 - ld a, [MenuSelection2] + jr nz, .UsewMenuCursorY + ld a, [wMenuCursorY] cp $3 ret z - jr c, .UseMenuSelection2 + jr c, .UsewMenuCursorY dec a jr .LoadToScriptVar -.UseMenuSelection2 - ld a, [MenuSelection2] +.UsewMenuCursorY + ld a, [wMenuCursorY] .LoadToScriptVar ld [ScriptVar], a @@ -564,7 +564,7 @@ Function17d2ce: ; 17d2ce ld [MusicFadeIDHi], a call PlayMusic call ReturnToMapFromSubmenu - call ReturnToCallingMenu + call CloseSubmenu ret ; 17d314 @@ -802,7 +802,7 @@ Function17d48d: ; 17d48d jr z, .asm_17d4e0 ld a, e ld [wcd6c], a - ld [wc2c0], a + ld [wMapMusic], a ld d, $0 call PlayMusic2 @@ -1933,16 +1933,16 @@ Function17dc1f: ; 17dc1f ld [wEnemyGoesFirst], a ld hl, wc708 call LoadMenuDataHeader - call InterpretMenu2 + call VerticalMenu jr nc, .asm_17dc6e ld a, $2 - ld [MenuSelection2], a + ld [wMenuCursorY], a .asm_17dc6e call WriteBackup pop af ld [rSVBK], a - ld a, [MenuSelection2] + ld a, [wMenuCursorY] cp $1 jr nz, .asm_17dc85 ld a, [$c68a] |