diff options
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/mobile_40.asm | 34 | ||||
| -rw-r--r-- | misc/mobile_42.asm | 18 | ||||
| -rwxr-xr-x | misc/mobile_46.asm | 4 |
3 files changed, 28 insertions, 28 deletions
diff --git a/misc/mobile_40.asm b/misc/mobile_40.asm index 62d6f0d4f..251b2abd4 100644 --- a/misc/mobile_40.asm +++ b/misc/mobile_40.asm @@ -1901,7 +1901,7 @@ Function100bc2: ; 100bc2 ld a, [MenuSelection2] and a jp nz, .asm_100bcb - ld a, [wd0eb] + ld a, [wNumMoves] inc a ld [MenuSelection2], a jp .asm_100bcb @@ -1909,7 +1909,7 @@ Function100bc2: ; 100bc2 .asm_100c10 ld a, [MenuSelection2] ld b, a - ld a, [wd0eb] + ld a, [wNumMoves] rept 2 inc a endr @@ -1989,7 +1989,7 @@ Function100c74: ; 100c74 Function100c98: ; 100c98 ld de, Unknown_100cad call InitMenu3 - ld a, [wd0eb] + ld a, [wNumMoves] inc a ld [wcfa3], a ld a, [CurMoveNum] @@ -2553,10 +2553,10 @@ Unknown_10102c: ; 10102c Function101050: ; 101050 call Function10107d ld a, [OTPartyCount] -rept 2 +rept 2 ; ??? ld hl, wc608 endr - ld bc, $01b3 + ld bc, wc7bb - wc608 call Function1010de ld hl, wc7bb ld [hl], e @@ -2566,7 +2566,7 @@ endr call GetSRAMBank ld hl, wc608 ld de, $a001 - ld bc, $01b5 + ld bc, wc7bd - wc608 call CopyBytes call CloseSRAM ret @@ -2575,11 +2575,11 @@ endr Function10107d: ; 10107d xor a ld hl, wc608 - ld bc, $01b5 + ld bc, wc7bd - wc608 call ByteFill ld hl, wd26b ld de, wc608 - ld bc, $000b + ld bc, NAME_LENGTH call CopyBytes ld hl, wd271 ld a, [hli] @@ -2588,16 +2588,16 @@ Function10107d: ; 10107d ld [wc608 + 12], a ld hl, OTPartyMonNicknames ld de, wc608 + 13 - ld bc, $000b - call Function1010cd + ld bc, NAME_LENGTH + call .CopyAllFromOT ld hl, OTPartyMonOT ld de, wc656 + 1 - ld bc, $000b - call Function1010cd + ld bc, NAME_LENGTH + call .CopyAllFromOT ld hl, OTPartyMon1Species ld de, wc68a + 15 - ld bc, $0030 - call Function1010cd + ld bc, PARTYMON_STRUCT_LENGTH + call .CopyAllFromOT ld a, $50 ld [wc7b9], a ld a, $33 @@ -2605,7 +2605,7 @@ Function10107d: ; 10107d ret ; 1010cd -Function1010cd: ; 1010cd +.CopyAllFromOT: ; 1010cd push hl ld hl, 0 ld a, [OTPartyCount] @@ -2621,7 +2621,7 @@ Function1010de: ; 1010de push hl push bc ld de, 0 -.asm_1010e3 +.loop ld a, [hli] add e ld e, a @@ -2631,7 +2631,7 @@ Function1010de: ; 1010de dec bc ld a, b or c - jr nz, .asm_1010e3 + jr nz, .loop pop bc pop hl ret diff --git a/misc/mobile_42.asm b/misc/mobile_42.asm index d559b9419..1ae6a04ae 100644 --- a/misc/mobile_42.asm +++ b/misc/mobile_42.asm @@ -519,7 +519,7 @@ Function10839b: ; 10839b ld de, VTiles2 call Function108201 call EnableLCD - callba Function8d03d + callba DeinitializeAllSprites xor a ld [hSCX], a ld [hSCY], a @@ -654,7 +654,7 @@ Function1084d7: ; 1084d7 ld de, VTiles2 call Function108201 call EnableLCD - callba Function8d03d + callba DeinitializeAllSprites call DelayFrame ld de, TradeBallGFX ld hl, VTiles0 @@ -723,7 +723,7 @@ Function108589: ; 108589 ld de, VTiles2 call Function108201 call EnableLCD - callba Function8d03d + callba DeinitializeAllSprites call DelayFrame ld de, TradeBallGFX ld hl, VTiles0 @@ -780,7 +780,7 @@ Function108589: ; 108589 ; 108638 Function108638: ; 108638 - callba Function8d03d + callba DeinitializeAllSprites call ClearBGPalettes call ClearSprites call ClearTileMap @@ -816,7 +816,7 @@ Function108638: ; 108638 ; 108689 Function108689: ; 108689 - callba Function8d03d + callba DeinitializeAllSprites call ClearBGPalettes call ClearSprites call ClearTileMap @@ -1067,7 +1067,7 @@ Function108863: ; 108863 jr .asm_108868 .asm_108879 - callba Function8d03d + callba DeinitializeAllSprites depixel 9, 10, 2, 0 ld a, SPRITE_ANIM_INDEX_25 call _InitSpriteAnimStruct @@ -1161,7 +1161,7 @@ Function10890a: ; 10890a Function108919: ; 108919 ld c, $28 call Function1082cc - callba Function8d03d + callba DeinitializeAllSprites call ClearBGPalettes call ClearSprites call ClearTileMap @@ -1546,7 +1546,7 @@ Function108b98: ; 108b98 ; 108bbd Function108bbd: ; 108bbd - callba Function8d03d + callba DeinitializeAllSprites call ClearSprites ret ; 108bc7 @@ -1564,7 +1564,7 @@ Function108bc7: ; 108bc7 (42:4bc7) ld [hl], a ret .asm_108bd9 - callba Function8d036 + callba DeinitializeSprite ret Function108be0: ; 108be0 (42:4be0) diff --git a/misc/mobile_46.asm b/misc/mobile_46.asm index 367465030..c48c87c8e 100755 --- a/misc/mobile_46.asm +++ b/misc/mobile_46.asm @@ -5965,7 +5965,7 @@ Function11ad1b: ; 11ad1b dec a ld [hObjectStructIndexBuffer], a ld a, $10 - ld [wc3b7], a + ld [wCurIconTile], a ld hl, Function8e83f ld a, BANK(Function8e83f) ld e, $4 @@ -6884,7 +6884,7 @@ Function11b295: ; 11b295 ld hl, $0003 add hl, bc ld e, [hl] - callba Function8e9bc + callba FlyFunction_GetMonIcon hlcoord 4, 14 push hl call GetPokemonName |