diff options
Diffstat (limited to 'misc')
| -rwxr-xr-x | misc/battle_tower_5c.asm | 387 | ||||
| -rwxr-xr-x | misc/fixed_words.asm | 4 | ||||
| -rw-r--r-- | misc/mobile_40.asm | 20 | ||||
| -rwxr-xr-x | misc/mobile_41.asm | 2 | ||||
| -rw-r--r-- | misc/mobile_42.asm | 6 | ||||
| -rw-r--r-- | misc/mobile_45.asm | 4 | ||||
| -rwxr-xr-x | misc/mobile_46.asm | 44 | ||||
| -rwxr-xr-x | misc/mobile_5b.asm | 32 | ||||
| -rwxr-xr-x | misc/mobile_5c.asm | 2 | ||||
| -rw-r--r-- | misc/mobile_5f.asm | 6 |
10 files changed, 259 insertions, 248 deletions
diff --git a/misc/battle_tower_5c.asm b/misc/battle_tower_5c.asm index 1c9c7436b..76a2eac44 100755 --- a/misc/battle_tower_5c.asm +++ b/misc/battle_tower_5c.asm @@ -1,11 +1,11 @@ Function1700b0: ; 1700b0 - call Function17021e + call Bank5c_ClearJumptableRAM callba Function118121 ret ; 1700ba Function1700ba: ; 1700ba - call Function17021e + call Bank5c_ClearJumptableRAM callba Function11811a ret ; 1700c4 @@ -17,21 +17,22 @@ Function1700c4: ; 1700c4 ld [rSVBK], a call Function17042c + ld a, $5 call GetSRAMBank ld a, $1 ld [$be45], a xor a ld [$be46], a - ld hl, $dffc + ld hl, w3_dffc ld de, $aa41 ld bc, $0004 call CopyBytes - ld hl, $d202 + ld hl, w3_d202 ld de, $aa8e - ld bc, $0594 + ld bc, 7 * $cc ; length of battle tower struct from japanese games? call CopyBytes - ld hl, $aa5d + ld hl, $aa5d ; some sort of count ld a, [hl] inc [hl] inc hl @@ -42,7 +43,7 @@ Function1700c4: ; 1700c4 add hl, de ld e, l ld d, h - ld hl, $dffc + ld hl, w3_dffc ld bc, $0004 call CopyBytes call CloseSRAM @@ -52,7 +53,7 @@ Function1700c4: ; 1700c4 ; 170114 Function170114: ; 170114 - call Function17021e + call Bank5c_ClearJumptableRAM call Function170121 callba Function11805f ret @@ -62,7 +63,7 @@ Function170121: ; 170121 ld a, $5 call GetSRAMBank ld hl, $a948 - ld de, $c608 + ld de, wMisc ld bc, $00f6 call CopyBytes call CloseSRAM @@ -71,27 +72,29 @@ Function170121: ; 170121 ; 170139 Function170139: ; 170139 +; Convert the 4-digit decimal number at 5:aa41 into binary ld a, $5 call GetSRAMBank ld de, $aa41 ld h, $0 ld l, h - ld bc, $03e8 - call Function17020c - ld bc, $0064 - call Function17020c - ld bc, $000a - call Function17020c + ld bc, 1000 + call .DecToBin + ld bc, 100 + call .DecToBin + ld bc, 10 + call .DecToBin ld a, [de] ld c, a ld b, $0 add hl, bc call CloseSRAM +; Store that number in wMisc ld a, h - ld [$c608], a + ld [wMisc], a ld a, l - ld [$c608 + 1], a - ld hl, $c628 + ld [wMisc + 1], a + ld hl, wBT_OTTempPkmn1DVs ld a, [PlayerID] ld [hli], a ld a, [PlayerID + 1] @@ -108,26 +111,26 @@ Function170139: ; 170139 ld bc, PlayerID ld de, PlayerGender callba Function4e929 - ld de, $c62c + 5 + ld de, wBT_OTTempPkmn1CaughtGender ld a, c ld [de], a inc de - ld a, $df + ld a, PartyMons % $100 ld [wcd49], a - ld a, $dc + ld a, PartyMons / $100 ld [wcd4a], a - ld a, $41 + ld a, PartyMonNicknames % $100 ld [wcd4b], a - ld a, $de + ld a, PartyMonNicknames / $100 ld [wcd4c], a - ld a, $3 -.asm_1701ac + ld a, 3 +.CopyLoop push af ld a, [wcd49] ld l, a ld a, [wcd4a] ld h, a - ld bc, $0030 + ld bc, PARTYMON_STRUCT_LENGTH call CopyBytes ld a, l ld [wcd49], a @@ -145,7 +148,7 @@ Function170139: ; 170139 ld [wcd4c], a pop af dec a - jr nz, .asm_1701ac + jr nz, .CopyLoop ld a, $4 call GetSRAMBank ld hl, $a013 @@ -157,7 +160,7 @@ Function170139: ; 170139 ld hl, $a894 ld bc, $0006 call CopyBytes - ld hl, $c608 + ld hl, wMisc ld de, $a948 ld bc, $00f6 call CopyBytes @@ -165,16 +168,16 @@ Function170139: ; 170139 ret ; 17020c -Function17020c: ; 17020c +.DecToBin: ; 17020c ld a, [de] inc de and a ret z -.loop +.digit_loop add hl, bc dec a - jr nz, .loop + jr nz, .digit_loop ret ; 170215 @@ -189,7 +192,7 @@ EmptySpecial_17021d: ; 17021d ret ; 17021e -Function17021e: ; 17021e +Bank5c_ClearJumptableRAM: ; 17021e xor a ld [wcf63], a ld [wcf64], a @@ -508,7 +511,7 @@ BT_ChrisName: ; 170426 Function17042c: ; 17042c ld hl, w3_d202TrainerData - ld a, 7 + ld a, BATTLETOWER_NROFTRAINERS .loop push af push hl @@ -521,7 +524,7 @@ Function17042c: ; 17042c ld a, [hli] and a jr z, .empty - cp $f + cp 15 jr nc, .copy_data push hl @@ -615,7 +618,7 @@ CopyBTTrainer_FromBT_OT_TowBT_OTTemp: ; 1704a2 ld [rSVBK], a ld hl, BT_OTTrainer ; $d100 - ld de, wBT_OTTemp ; $c608 + ld de, wBT_OTTemp ; wMisc ld bc, BATTLE_TOWER_STRUCT_LENGTH call CopyBytes @@ -624,7 +627,7 @@ CopyBTTrainer_FromBT_OT_TowBT_OTTemp: ; 1704a2 ld a, BANK(sBattleTowerChallengeState) call GetSRAMBank - ld a, $2 + ld a, BATTLETOWER_CHALLENGE_IN_PROGESS ld [sBattleTowerChallengeState], a ld hl, sNrOfBeatenBattleTowerTrainers inc [hl] @@ -632,7 +635,9 @@ CopyBTTrainer_FromBT_OT_TowBT_OTTemp: ; 1704a2 SkipBattleTowerTrainer: ; 1704c9 ret ; 1704ca + Function1704ca: ; 1704ca +; unreferenced mobile function ld a, [$be46] cp $7 jr c, .asm_1704d3 @@ -653,36 +658,37 @@ Function1704ca: ; 1704ca ; 1704e1 Function1704e1: ; 1704e1 +; unreferenced special call SpeechTextBox call FadeToMenu - call Function17021e - call Function1704f1 + call Bank5c_ClearJumptableRAM + call .JumptableLoop call ReturnToCallingMenu ret ; 1704f1 -Function1704f1: ; 1704f1 +.JumptableLoop: ; 1704f1 call ClearBGPalettes call ClearSprites call ClearScreen -.asm_1704fa +.loop call JoyTextDelay ld a, [wJumptableIndex] bit 7, a - jr nz, .asm_17050f - call Function170510 + jr nz, .done + call .DoJumptable callba ReloadMapPart - jr .asm_1704fa + jr .loop -.asm_17050f +.done ret ; 170510 -Function170510: ; 170510 +.DoJumptable: ; 170510 ld a, [wJumptableIndex] ld e, a ld d, 0 - ld hl, Jumptable_17051f + ld hl, .jumptable rept 2 add hl, de endr @@ -692,13 +698,13 @@ endr jp [hl] ; 17051f -Jumptable_17051f: ; 17051f - dw Function170525 - dw Function170571 - dw Function170577 +.jumptable: ; 17051f + dw .Jumptable_0 + dw .Jumptable_1 + dw .Jumptable_2 ; 170525 -Function170525: ; 170525 +.Jumptable_0: ; 170525 ld a, $5 call GetSRAMBank @@ -708,7 +714,7 @@ Function170525: ; 170525 call CopyBytes ld hl, $a8b2 - ld de, $c608 + ld de, wMisc ld bc, $0096 call CopyBytes @@ -717,117 +723,117 @@ Function170525: ; 170525 ld de, StringBuffer3 call PlaceString hlcoord 1, 3 - ld de, String_170676 + ld de, .String_Mail call PlaceString hlcoord 4, 3 ld de, StringBuffer4 call PlaceString hlcoord 8, 3 - ld de, String_17067a + ld de, .String_PastReaders call PlaceString - call Function1705b7 - call Function1705f0 - jr Function1705b2 + call .DrawBorder + call .PlaceTextItems + jr .NextJumptableFunction -Function170571: +.Jumptable_1: call SetPalettes - call Function1705b2 + call .NextJumptableFunction -Function170577: +.Jumptable_2: ld hl, hJoyPressed ld a, [hl] - and $1 - jr nz, .asm_1705ac + and A_BUTTON + jr nz, .pressed_a_or_b ld a, [hl] - and $2 - jr nz, .asm_1705ac + and B_BUTTON + jr nz, .pressed_a_or_b ld a, [hl] - and $40 - jr nz, .asm_17058f + and D_UP + jr nz, .pressed_up ld a, [hl] - and $80 - jr nz, .asm_17059d + and D_DOWN + jr nz, .pressed_down ret -.asm_17058f +.pressed_up ld a, [wcf64] and a ret z - sub $f + sub 15 ld [wcf64], a - call Function1705f0 + call .PlaceTextItems ret -.asm_17059d +.pressed_down ld a, [wcf64] - cp $3c + cp 60 ret z - add $f + add 15 ld [wcf64], a - call Function1705f0 + call .PlaceTextItems ret -.asm_1705ac +.pressed_a_or_b ld hl, wJumptableIndex set 7, [hl] ret -Function1705b2: +.NextJumptableFunction: ld hl, wJumptableIndex inc [hl] ret ; 1705b7 -Function1705b7: ; 1705b7 +.DrawBorder: ; 1705b7 hlcoord 0, 4 ld a, $79 ld [hli], a - ld c, $12 -.asm_1705bf + ld c, SCREEN_WIDTH - 2 +.top_border_loop ld a, $7a ld [hli], a dec c - jr nz, .asm_1705bf + jr nz, .top_border_loop ld a, $7b ld [hli], a - ld de, $0014 - ld c, $c -.asm_1705cd + ld de, SCREEN_WIDTH + ld c, 12 +.left_border_loop ld a, $7c ld [hl], a add hl, de dec c - jr nz, .asm_1705cd + jr nz, .left_border_loop ld a, $7d ld [hli], a - ld c, $12 -.asm_1705d9 + ld c, SCREEN_WIDTH - 2 +.bottom_border_loop ld a, $7a ld [hli], a dec c - jr nz, .asm_1705d9 + jr nz, .bottom_border_loop ld a, $7e ld [hl], a - ld de, $ffec + ld de, -SCREEN_WIDTH add hl, de - ld c, $c -.asm_1705e8 + ld c, 12 +.right_border_loop ld a, $7c ld [hl], a add hl, de dec c - jr nz, .asm_1705e8 + jr nz, .right_border_loop ret ; 1705f0 -Function1705f0: ; 1705f0 - call Function17064b - call Function17065d +.PlaceTextItems: ; 1705f0 + call .ClearBox + call .PlaceUpDownArrows ld a, $50 ld [wcd4e], a - ld hl, $c608 + ld hl, wMisc ld a, [wcf64] ld c, a xor a @@ -836,19 +842,20 @@ Function1705f0: ; 1705f0 push hl pop bc hlcoord 1, 6 - ld a, $6 -.asm_17060c + ld a, 6 +.loop1 push af push hl - ld a, $3 -.asm_170610 + ld a, 3 +.loop2 push af ld de, wcd49 ld a, [bc] and a - jr z, .asm_170625 - ld a, $5 -.asm_17061a + jr z, .fill_with_e3 +; .copy + ld a, 5 +.loop3a push af ld a, [bc] ld [de], a @@ -856,12 +863,12 @@ Function1705f0: ; 1705f0 inc de pop af dec a - jr nz, .asm_17061a - jr .asm_170631 + jr nz, .loop3a + jr .rejoin -.asm_170625 - ld a, $5 -.asm_170627 +.fill_with_e3 + ld a, 5 +.loop3b push af ld a, $e3 ld [de], a @@ -869,68 +876,68 @@ Function1705f0: ; 1705f0 inc bc pop af dec a - jr nz, .asm_170627 + jr nz, .loop3b -.asm_170631 +.rejoin ld de, wcd49 push bc call PlaceString - ld de, $0006 + ld de, 6 add hl, de pop bc pop af dec a - jr nz, .asm_170610 + jr nz, .loop2 pop hl - ld de, $0028 + ld de, $28 add hl, de pop af dec a - jr nz, .asm_17060c + jr nz, .loop1 ret ; 17064b -Function17064b: ; 17064b +.ClearBox: ; 17064b hlcoord 1, 5 xor a - ld b, $c -.asm_170651 - ld c, $12 -.asm_170653 + ld b, 12 +.clearbox_row + ld c, SCREEN_WIDTH - 2 +.clearbox_column ld [hli], a dec c - jr nz, .asm_170653 + jr nz, .clearbox_column rept 2 inc hl endr dec b - jr nz, .asm_170651 + jr nz, .clearbox_row ret ; 17065d -Function17065d: ; 17065d +.PlaceUpDownArrows: ; 17065d ld a, [wcf64] and a - jr z, .asm_170669 + jr z, .nope hlcoord 18, 5 - ld a, $61 + ld a, "▲" ld [hl], a -.asm_170669 +.nope ld a, [wcf64] - cp $3c + cp 60 ret z hlcoord 18, 16 - ld a, $ee + ld a, "▼" ld [hl], a ret ; 170676 -String_170676: ; 170676 +.String_Mail: ; 170676 db "ルーム@" ; 17067a -String_17067a: ; 17067a +.String_PastReaders: ; 17067a db "れきだいりーダーいちらん@" ; 170687 @@ -953,13 +960,13 @@ endr dw Function17075f ; 0x00 dw Function170788 ; 0x01 dw Function170778 ; 0x02 - dw Function170799 ; 0x03 - dw Function17079d ; 0x04 + dw BattleTowerAction_SetByteToQuickSaveChallenge ; 0x03 + dw BattleTowerAction_SetByteToCancelChallenge ; 0x04 dw Function1707ac ; 0x05 dw Function1707f4 ; 0x06 - dw Function170868 ; 0x07 - dw Function170881 ; 0x08 - dw Function17089a ; 0x09 + dw SaveBattleTowerLevelGroup ; 0x07 + dw LoadBattleTowerLevelGroup ; 0x08 + dw BattleTower_CheckSaveFileExistsAndIsYours ; 0x09 dw Function1708b1 ; 0x0a dw CheckMobileEventIndex ; 0x0b dw Function1708c8 ; 0x0c @@ -980,7 +987,7 @@ endr dw Function1706ee ; 0x1b dw Function17071b ; 0x1c dw Function170729 ; 0x1d - dw Function17073e ; 0x1e + dw BattleTower_RandomlyChooseReward ; 0x1e dw Function170737 ; 0x1f @@ -1033,7 +1040,7 @@ Function1706ee: ; 1706ee (5c:46ee) BattleTowerAction $1b Function17071b: ; 17071b (5c:471b) BattleTowerAction $1c ld a, BANK(sBattleTowerChallengeState) call GetSRAMBank - ld a, $3 + ld a, BATTLETOWER_WON_CHALLENGE ld [sBattleTowerChallengeState], a call CloseSRAM ret @@ -1041,7 +1048,7 @@ Function17071b: ; 17071b (5c:471b) BattleTowerAction $1c Function170729: ; 170729 (5c:4729) BattleTowerAction $1d ld a, BANK(sBattleTowerChallengeState) call GetSRAMBank - ld a, $4 + ld a, BATTLETOWER_RECEIVED_REWARD ld [sBattleTowerChallengeState], a call CloseSRAM ret @@ -1050,7 +1057,7 @@ Function170737: ; 170737 (5c:4737) BattleTowerAction $1e callba SaveOptions ret -Function17073e: ; 17073e (5c:473e) BattleTowerAction $1f +BattleTower_RandomlyChooseReward: ; 17073e (5c:473e) BattleTowerAction $1f ; Generate a random stat boosting item. .loop call Random @@ -1072,7 +1079,7 @@ Function17073e: ; 17073e (5c:473e) BattleTowerAction $1f ret Function17075f: ; 17075f (5c:475f) BattleTowerAction $00 - call Function17089a + call BattleTower_CheckSaveFileExistsAndIsYours ld a, [ScriptVar] and a ret z @@ -1103,12 +1110,12 @@ Function170788: ; 170788 (5c:4788) BattleTowerAction $01 call CloseSRAM ret -Function170799: ; 170799 (5c:4799) BattleTowerAction $03 - ld c, $1 +BattleTowerAction_SetByteToQuickSaveChallenge: ; 170799 (5c:4799) BattleTowerAction $03 + ld c, BATTLETOWER_SAVED_AND_LEFT jr asm_17079f -Function17079d: ; 17079d (5c:479d) BattleTowerAction $04 - ld c, $0 +BattleTowerAction_SetByteToCancelChallenge: ; 17079d (5c:479d) BattleTowerAction $04 + ld c, BATTLETOWER_NO_CHALLENGE asm_17079f: ; 17079f (5c:479f) ld a, BANK(sBattleTowerChallengeState) call GetSRAMBank @@ -1203,9 +1210,10 @@ Function17081d: ; 17081d (5c:481d) BattleTowerAction $17 and a jr nz, .asm_170853 ret + .asm_170849 ld hl, CurDay - ld a, $8c + ld a, 140 sub c add [hl] cp $b @@ -1221,39 +1229,39 @@ Function17081d: ; 17081d (5c:481d) BattleTowerAction $17 call CloseSRAM ret -Function170868: ; 170868 (5c:4868) BattleTowerAction $07 - ld a, BANK(sbe47) +SaveBattleTowerLevelGroup: ; 170868 (5c:4868) BattleTowerAction $07 + ld a, BANK(sBTChoiceOfLevelGroup) call GetSRAMBank ld a, [rSVBK] push af ld a, $3 ld [rSVBK], a - ld a, [wd000 + $800] - ld [sbe47], a + ld a, [wBTChoiceOfLvlGroup] + ld [sBTChoiceOfLevelGroup], a pop af ld [rSVBK], a call CloseSRAM ret -Function170881: ; 170881 (5c:4881) BattleTowerAction $08 - ld a, BANK(sbe47) +LoadBattleTowerLevelGroup: ; 170881 (5c:4881) BattleTowerAction $08 ; Load level group choice + ld a, BANK(sBTChoiceOfLevelGroup) call GetSRAMBank ld a, [rSVBK] push af ld a, $3 ld [rSVBK], a - ld a, [sbe47] - ld [wd000 + $800], a + ld a, [sBTChoiceOfLevelGroup] + ld [wBTChoiceOfLvlGroup], a pop af ld [rSVBK], a call CloseSRAM ret -Function17089a: ; 17089a BattleTowerAction $09 +BattleTower_CheckSaveFileExistsAndIsYours: ; 17089a BattleTowerAction $09 ld a, [wSaveFileExists] and a jr z, .nope - callba Function14bcb + callba CompareLoadedAndSavedPlayerID jr z, .yes xor a jr .nope @@ -1359,7 +1367,7 @@ Function17093c: ; 17093c (5c:493c) BattleTowerAction $0e jr nz, .not_egg push hl ld hl, PartyMonOT ; wddff (aliases: PartyMonOT) - ld de, $6 + ld de, $6 ; NAME_LENGTH ld a, b and a jr z, .skip @@ -1369,38 +1377,38 @@ Function17093c: ; 17093c (5c:493c) BattleTowerAction $0e jr nz, .loop2 .skip ld de, String_1709a4 - ld a, $6 -.asm_17096e + ld a, $6 ; NAME_LENGTH +.compare_loop push af ld a, [de] inc de cp [hl] inc hl - jr nz, .asm_17099d + jr nz, .different pop af dec a - jr nz, .asm_17096e + jr nz, .compare_loop rept 4 dec hl endr - ld a, $50 + ld a, "@" rept 2 ld [hli], a endr pop hl ld a, EGG_TICKET ld [CurItem], a - ld a, $1 + ld a, 1 ld [wItemQuantityChangeBuffer], a - ld a, $ff - ld [wd107], a + ld a, -1 + ld [ItemCountBuffer], a ld hl, NumItems call TossItem ld a, $1 ld [ScriptVar], a ret -.asm_17099d +.different pop af pop hl .not_egg @@ -1454,30 +1462,30 @@ endr ; 1709e7 (5c:49e7) Jumptable_1709e7: ; 1709e7 - dw Function170a00 - dw Function170a00 - dw Function1709f3 - dw Function1709f3 - dw Function170a01 - dw Function170a33 + dw .NoAction + dw .NoAction + dw .DoAction1 + dw .DoAction1 + dw .Action4 + dw .Action5 ; 1709f3 -Function1709f3: ; 1709f3 +.DoAction1: ; 1709f3 ld a, $5 call GetSRAMBank ld a, $1 ld [$a800], a call CloseSRAM -Function170a00: ; 170a00 +.NoAction: ; 170a00 ret ; 170a01 -Function170a01: ; 170a01 +.Action4: ; 170a01 ld a, $5 call GetSRAMBank ld hl, $b023 - ld de, $c608 + ld de, wMisc ld bc, $0069 call CopyBytes ld a, [$a825] @@ -1492,27 +1500,27 @@ Function170a01: ; 170a01 ret ; 170a33 -Function170a33: ; 170a33 +.Action5: ; 170a33 ld a, $0 call GetSRAMBank ld hl, wRTC - ld de, $c608 + ld de, wMisc ld bc, $0004 call CopyBytes call CloseSRAM ld a, $5 call GetSRAMBank ld hl, $b08c - ld de, $c608 + ld de, wMisc ld c, $4 -.asm_170a54 +.compare_loop ld a, [de] inc de cp [hl] - jr nz, .asm_170a78 + jr nz, .different inc hl dec c - jr nz, .asm_170a54 + jr nz, .compare_loop call CloseSRAM ld a, [MapGroup] ld b, a @@ -1521,17 +1529,17 @@ Function170a33: ; 170a33 call GetMapTrigger ld a, d or e - jr z, .asm_170a72 + jr z, .no_trigger ld a, [de] and a ret nz -.asm_170a72 +.no_trigger ld a, $1 ld [ScriptVar], a ret -.asm_170a78 +.different call CloseSRAM ld a, $5 call GetSRAMBank @@ -1546,11 +1554,11 @@ Function170a33: ; 170a33 call GetMapTrigger ld a, d or e - jr z, .asm_170a9b + jr z, .no_trigger_2 xor a ld [de], a -.asm_170a9b +.no_trigger_2 ret ; 170a9c @@ -1577,10 +1585,11 @@ Function170aaf: ; 170aaf (5c:4aaf) BattleTowerAction $13 ret Function170abe: ; 170abe (5c:4abe) BattleTowerAction $14 - call Function17089a + call BattleTower_CheckSaveFileExistsAndIsYours ld a, [ScriptVar] and a ret z + ld a, BANK(sbe4f) call GetSRAMBank ld a, [sbe4f] @@ -1603,13 +1612,13 @@ Function170ae8: ; 170ae8 (5c:4ae8) BattleTowerAction $18 call GetSRAMBank ld a, [$b2fb] call CloseSRAM - ld c, $a + ld c, 10 call SimpleDivide ld a, b ld [wcd4f], a xor a ld [ScriptVar], a - callba Function119d93 + callba Function119d93 ; level check ret nc ld a, $5 call GetSRAMBank @@ -1629,7 +1638,7 @@ Function170b16: ; 170b16 (5c:4b16) BattleTowerAction $19 ld [wcd4f], a xor a ld [ScriptVar], a - callba Function119dd1 + callba Function119dd1 ; ubers check ret nc ld a, $5 call GetSRAMBank diff --git a/misc/fixed_words.asm b/misc/fixed_words.asm index 708116689..a3d3f0389 100755 --- a/misc/fixed_words.asm +++ b/misc/fixed_words.asm @@ -308,7 +308,7 @@ Function11c1ca: ; 11c1ca callba ReloadMapPart callba Function8cf53 callba LoadPokemonData - callba Function40c30 + callba Pokedex_ABCMode ld a, [rSVBK] push af ld a, $5 @@ -362,7 +362,7 @@ Function11c283: ; 11c283 bit 7, a jr nz, .exit call .DoJumptableFunction - callba Function8cf69 + callba PlaySpriteAnimations callba ReloadMapPart jr .loop diff --git a/misc/mobile_40.asm b/misc/mobile_40.asm index 9b98046c0..211fabea5 100644 --- a/misc/mobile_40.asm +++ b/misc/mobile_40.asm @@ -2011,7 +2011,7 @@ Function100cb5: ; 100cb5 call Function100dd2 callba Function241ba push bc - callba Function8cf69 + callba PlaySpriteAnimations callba Function10402d call Function100dfd pop bc @@ -2065,7 +2065,7 @@ Function100d22: ; 100d22 call Function100dd2 callba Function241ba push bc - callba Function8cf69 + callba PlaySpriteAnimations callba Function10402d call Function100dfd pop bc @@ -4059,7 +4059,7 @@ Function101a21: ; 101a21 ld a, $1 ld [wc2d7], a callba BattleIntro - callba SendOutFirstMons + callba DoBattle callba ShowLinkBattleParticipantsAfterEnd xor a ld [wc2d7], a @@ -6006,7 +6006,7 @@ Function1027eb: ; 1027eb ld c, $12 ld d, h ld e, l - callba Function16d61d + callba _LinkTextbox ld de, String_102804 hlcoord 2, 16 call PlaceString @@ -6302,7 +6302,7 @@ Function1029cf: ; 1029cf ld c, $8 ld d, h ld e, l - callba Function16d61d + callba _LinkTextbox ld de, String_102a26 hlcoord 12, 8 call PlaceString @@ -6468,7 +6468,7 @@ Function102b32: ; 102b32 dec a ld [CurPartyMon], a ld a, $1 - ld [wd1e9], a + ld [wForceEvolution], a callba EvolvePokemon call Function102d9a call Function102dd3 @@ -6774,11 +6774,11 @@ Function102d48: ; 102d48 call AddNTimes predef GetUnownLetter callba UpdateUnownDex - ld a, [wdef4] + ld a, [wFirstUnownSeen] and a jr nz, .asm_102d98 ld a, [UnownLetter] - ld [wdef4], a + ld [wFirstUnownSeen], a .asm_102d98 and a @@ -6812,7 +6812,7 @@ Function102dc3: ; 102dc3 ld c, $12 ld d, h ld e, l - callba Function16d61d + callba _LinkTextbox ret ; 102dd3 @@ -6855,7 +6855,7 @@ Function102e07: ; 102e07 ld c, $b ld d, h ld e, l - callba Function16d61d + callba _LinkTextbox .asm_102e28 ld de, String_102e32 diff --git a/misc/mobile_41.asm b/misc/mobile_41.asm index 69abe1cd2..79f52115e 100755 --- a/misc/mobile_41.asm +++ b/misc/mobile_41.asm @@ -1058,7 +1058,7 @@ Function1064d8: ; 1064d8 jr asm_1064ed asm_1064ed - ld de, w6_d000 + ld de, wBackupTilemap ld b, $0 ld a, [rSVBK] push af diff --git a/misc/mobile_42.asm b/misc/mobile_42.asm index 0e25021bf..c2d7171e0 100644 --- a/misc/mobile_42.asm +++ b/misc/mobile_42.asm @@ -400,7 +400,7 @@ Function1082c6: ; 1082c6 Function1082cc: ; 1082cc .asm_1082cc push bc - callba Function8cf69 + callba PlaySpriteAnimations pop bc call DelayFrame dec c @@ -410,7 +410,7 @@ Function1082cc: ; 1082cc Function1082db: ; 1082db .asm_1082db - callba Function8cf69 + callba PlaySpriteAnimations callba Functiond00b4 callba Function10402d jr nc, .asm_1082db @@ -431,7 +431,7 @@ Function1082fa: ; 1082fa call Function108b78 push hl push bc - callba Function8cf69 + callba PlaySpriteAnimations pop bc pop hl call DelayFrame diff --git a/misc/mobile_45.asm b/misc/mobile_45.asm index 006a135f1..40e4cac16 100644 --- a/misc/mobile_45.asm +++ b/misc/mobile_45.asm @@ -5662,7 +5662,7 @@ Function1161d5: ; 1161d5 ld [rSVBK], a ld hl, Unknown_117356 - ld de, w6_d000 + ld de, wBackupTilemap ld bc, $0300 call CopyBytes @@ -7721,7 +7721,7 @@ Function1176ee: ; 1176ee (45:76ee) bit 7, a jr nz, .asm_117709 call Function117719 - callba Function8cf69 + callba PlaySpriteAnimations callba ReloadMapPart jr Function1176ee .asm_117709 diff --git a/misc/mobile_46.asm b/misc/mobile_46.asm index 836da4fa0..8bfed5609 100755 --- a/misc/mobile_46.asm +++ b/misc/mobile_46.asm @@ -4108,7 +4108,7 @@ Function119d93: ; 119d93 (46:5d93) ld bc, PARTYMON_STRUCT_LENGTH ld de, PartyMon1Level ld a, [PartyCount] -.asm_119daf +.party_loop push af ld a, [de] push hl @@ -4119,17 +4119,18 @@ Function119d93: ; 119d93 (46:5d93) pop de pop hl cp [hl] - jr z, .asm_119dbd - jr nc, .asm_119dc6 -.asm_119dbd + jr z, .equal + jr nc, .exceeds +.equal pop af dec a - jr nz, .asm_119daf + jr nz, .party_loop pop af ld [rSVBK], a and a ret -.asm_119dc6 + +.exceeds pop af ld a, $4 ld [wcf66], a @@ -4143,40 +4144,41 @@ Function119dd1: ; 119dd1 (46:5dd1) push af ld a, [wcd4f] cp 70 / 10 - jr nc, .asm_119e08 + jr nc, .level_70_or_more ld a, $1 ld [rSVBK], a ld hl, PartyMon1Level ld bc, PARTYMON_STRUCT_LENGTH ld de, PartySpecies ld a, [PartyCount] -.asm_119deb +.loop push af ld a, [de] cp MEWTWO - jr z, .asm_119dfd + jr z, .uber cp MEW - jr z, .asm_119dfd + jr z, .uber cp LUGIA - jr c, .asm_119e02 + jr c, .next cp NUM_POKEMON + 1 - jr nc, .asm_119e02 -.asm_119dfd + jr nc, .next +.uber ld a, [hl] cp 70 - jr c, .asm_119e0d -.asm_119e02 + jr c, .uber_under_70 +.next add hl, bc inc de pop af dec a - jr nz, .asm_119deb -.asm_119e08 + jr nz, .loop +.level_70_or_more pop af ld [rSVBK], a and a ret -.asm_119e0d + +.uber_under_70 pop af ld a, [de] ld [wd265], a @@ -5984,7 +5986,7 @@ Function11ad1b: ; 11ad1b ld [wcd30], a ld a, $2 ld [wc7d4], a - callba Function40bdc + callba Pokedex_ChangeMode ret ; 11ad6e @@ -7677,7 +7679,7 @@ Function11b7e5: ; 11b7e5 callba Function108016 callba Function17d1f1 ld a, $1 - ld [wd1e9], a + ld [wForceEvolution], a ld a, $2 ld [wLinkMode], a callba EvolvePokemon @@ -7707,7 +7709,7 @@ Function11b7e5: ; 11b7e5 ; 11b879 Function11b879: ; 11b879 - callba Function17089a + callba BattleTower_CheckSaveFileExistsAndIsYours ld a, [ScriptVar] and a ret z diff --git a/misc/mobile_5b.asm b/misc/mobile_5b.asm index 19d192aeb..cd2d57e82 100755 --- a/misc/mobile_5b.asm +++ b/misc/mobile_5b.asm @@ -908,22 +908,21 @@ INCBIN "gfx/unknown/16d5cd.tilemap" Tilemap_16d5f5: INCBIN "gfx/unknown/16d5f5.tilemap" -Function16d61d: ; 16d61d +_LinkTextbox: ; 16d61d ld h, d ld l, e push bc push hl - call Function16d640 + call .draw_border pop hl pop bc + ld de, AttrMap - TileMap add hl, de -rept 2 inc b -endr -rept 2 + inc b + inc c inc c -endr ld a, $7 .loop push bc @@ -941,43 +940,44 @@ endr ret ; 16d640 -Function16d640: ; 16d640 +.draw_border: ; 16d640 push hl ld a, $30 ld [hli], a inc a - call Function16d66d + call .fill_row inc a ld [hl], a pop hl ld de, SCREEN_WIDTH add hl, de -.loop +.loop3 push hl ld a, $33 ld [hli], a ld a, " " - call Function16d66d + call .fill_row ld [hl], $34 pop hl ld de, SCREEN_WIDTH add hl, de dec b - jr nz, .loop + jr nz, .loop3 + ld a, $35 ld [hli], a ld a, $36 - call Function16d66d + call .fill_row ld [hl], $37 ret ; 16d66d -Function16d66d: ; 16d66d +.fill_row: ; 16d66d ld d, c -.loop +.loop4 ld [hli], a dec d - jr nz, .loop + jr nz, .loop4 ret ; 16d673 @@ -1029,7 +1029,7 @@ Function16d6ae: ; 16d6ae ; 16d6ca LinkTextbox: ; 16d6ca - call Function16d61d + call _LinkTextbox ret ; 16d6ce diff --git a/misc/mobile_5c.asm b/misc/mobile_5c.asm index ebebb302c..8eedea0fd 100755 --- a/misc/mobile_5c.asm +++ b/misc/mobile_5c.asm @@ -422,7 +422,7 @@ Function171a11: ; 171a11 (5c:5a11) bit 7, a jr nz, .asm_171a2c call Function171a36 - callba Function8cf69 + callba PlaySpriteAnimations callba ReloadMapPart jr Function171a11 .asm_171a2c diff --git a/misc/mobile_5f.asm b/misc/mobile_5f.asm index 19c3748e8..26bf5f28e 100644 --- a/misc/mobile_5f.asm +++ b/misc/mobile_5f.asm @@ -302,7 +302,7 @@ Function17d0f3: ; 17d0f3 callba Function10804d callba Function17d1f1 ld a, $1 - ld [wd1e9], a + ld [wForceEvolution], a ld a, $2 ld [wLinkMode], a callba EvolvePokemon @@ -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 |