diff options
Diffstat (limited to 'misc/mobile_45.asm')
| -rw-r--r-- | misc/mobile_45.asm | 78 |
1 files changed, 39 insertions, 39 deletions
diff --git a/misc/mobile_45.asm b/misc/mobile_45.asm index e0ea8d457..1a891ce6c 100644 --- a/misc/mobile_45.asm +++ b/misc/mobile_45.asm @@ -14428,7 +14428,7 @@ Function11ad1b: ; 11ad1b ld a, [wcfa9] ld [wcd82], a dec a - ld [hConnectedMapWidth], a + ld [hObjectStructIndexBuffer], a ld a, $10 ld [wc3b7], a ld hl, Function8e83f @@ -15521,7 +15521,7 @@ Function11b3d9: ; 11b3d9 add [hl] cp e jr z, .asm_11b40d - ld hl, $0000 + ld hl, 0 ld bc, $0070 call AddNTimes ld e, l @@ -16285,29 +16285,29 @@ Function11b93b: ; 11b93b xor a ld [$a800], a ld hl, $a823 - ld de, $c608 + ld de, wEnemyMoveStruct ld bc, $008f call CopyBytes call CloseSRAM - ld a, $8 - ld [BGMapBuffer], a - ld a, $c6 + ld a, wEnemyMoveStruct % $100 + ld [wcd20], a + ld a, wEnemyMoveStruct / $100 ld [wcd21], a - ld a, $11 - ld [CreditsTimer], a - ld a, $c6 + ld a, $c611 % $100 + ld [wcd22], a + ld a, $c611 / $100 ld [wcd23], a - ld a, $41 + ld a, $c641 % $100 ld [wcd24], a - ld a, $c6 + ld a, $c641 / $100 ld [wcd25], a - ld a, $46 + ld a, $c646 % $100 ld [wcd26], a - ld a, $c6 + ld a, $c646 / $100 ld [wcd27], a - ld a, $4b + ld a, $c64b % $100 ld [wcd28], a - ld a, $c6 + ld a, $c64b / $100 ld [wcd29], a call Function11b98f callba Function14a58 @@ -16319,17 +16319,17 @@ Function11b98f: ; 11b98f ld a, [hl] ld e, a inc [hl] - ld a, [BGMapBuffer] + ld a, [wcd20] ld l, a ld a, [wcd21] ld h, a inc hl ld bc, PartySpecies ld d, e -.asm_11b9a2 +.loop1 inc bc dec d - jr nz, .asm_11b9a2 + jr nz, .loop1 ld a, e ld [CurPartyMon], a ld a, [hl] @@ -16341,11 +16341,11 @@ Function11b98f: ; 11b98f ld bc, PartyMon2 - PartyMon1 ld a, e ld [wcd2a], a -.asm_11b9ba +.loop2 add hl, bc dec a and a - jr nz, .asm_11b9ba + jr nz, .loop2 ld e, l ld d, h ld a, [CreditsTimer] @@ -16355,49 +16355,49 @@ Function11b98f: ; 11b98f ld bc, PartyMon2 - PartyMon1 call CopyBytes ld hl, PartyMonOT - ld bc, $000b + ld bc, NAME_LENGTH ld a, [wcd2a] -.asm_11b9d8 +.loop3 add hl, bc dec a and a - jr nz, .asm_11b9d8 + jr nz, .loop3 ld e, l ld d, h ld a, [wcd24] ld l, a ld a, [wcd25] ld h, a - ld bc, $000a + ld bc, PKMN_NAME_LENGTH - 1 call CopyBytes - ld a, $50 + ld a, "@" ld [de], a ld hl, PartyMonNicknames - ld bc, $000b + ld bc, PKMN_NAME_LENGTH ld a, [wcd2a] -.asm_11b9f9 +.loop4 add hl, bc dec a and a - jr nz, .asm_11b9f9 + jr nz, .loop4 ld e, l ld d, h ld a, [wcd26] ld l, a ld a, [wcd27] ld h, a - ld bc, $000a + ld bc, PKMN_NAME_LENGTH - 1 call CopyBytes - ld a, $50 + ld a, "@" ld [de], a - ld hl, $a600 - ld bc, $002f + ld hl, s0_a600 + ld bc, party_struct_length - 1 ld a, [wcd2a] -.asm_11ba1a +.loop5 add hl, bc dec a and a - jr nz, .asm_11ba1a + jr nz, .loop5 ld a, $0 call GetSRAMBank ld e, l @@ -16406,14 +16406,14 @@ Function11b98f: ; 11b98f ld l, a ld a, [wcd29] ld h, a - ld bc, $002f + ld bc, party_struct_length - 1 call CopyBytes call CloseSRAM ret ; 11ba38 Function11ba38: ; 11ba38 - callba Functione538 + callba CheckCurPartyMonFainted ret c xor a ld [ScriptVar], a @@ -23950,7 +23950,7 @@ endr ld a, EGG_TICKET ld [CurItem], a ld a, $1 - ld [wd10c], a + ld [wItemQuantityChangeBuffer], a ld a, $ff ld [wd107], a ld hl, NumItems @@ -24234,9 +24234,9 @@ Function_LoadOpponentTrainerAndPokemonsWithOTSprite: ; 0x170b44 ld hl, UsedSprites add hl, de ld [hli], a - ld [$ffbd], a + ld [hUsedSpriteIndex], a ld a, [hl] - ld [$ffbe], a + ld [hUsedSpriteTile], a callba Function143c8 ret ; 170b90 |