diff options
Diffstat (limited to 'misc')
| -rwxr-xr-x | misc/battle_tower_5c.asm | 16 | ||||
| -rwxr-xr-x | misc/fixed_words.asm | 223 | ||||
| -rwxr-xr-x | misc/mobile_12.asm | 12 | ||||
| -rw-r--r-- | misc/mobile_22_2.asm | 6 | ||||
| -rw-r--r-- | misc/mobile_40.asm | 23 | ||||
| -rw-r--r-- | misc/mobile_42.asm | 42 | ||||
| -rwxr-xr-x | misc/mobile_46.asm | 244 | ||||
| -rw-r--r-- | misc/mobile_5f.asm | 129 | ||||
| -rwxr-xr-x | misc/mobile_menu.asm | 12 |
9 files changed, 226 insertions, 481 deletions
diff --git a/misc/battle_tower_5c.asm b/misc/battle_tower_5c.asm index ea6ef9865..a7eb38eb4 100755 --- a/misc/battle_tower_5c.asm +++ b/misc/battle_tower_5c.asm @@ -203,7 +203,7 @@ InitBattleTowerChallengeRAM: ; 17021e _BattleTowerBattle: ; 17022c .loop - call .do_jumptable + call .do_dw call DelayFrame ld a, [wBattleTowerBattleEnded] cp $1 @@ -211,11 +211,11 @@ _BattleTowerBattle: ; 17022c ret ; 17023a -.do_jumptable: ; 17023a +.do_dw: ; 17023a ld a, [wBattleTowerBattleEnded] ld e, a ld d, 0 - ld hl, .jumptable + ld hl, .dw rept 2 add hl, de endr @@ -225,7 +225,7 @@ endr jp [hl] ; 170249 -.jumptable: ; 170249 +.dw: ; 170249 dw RunBattleTowerTrainer dw SkipBattleTowerTrainer ; 17024d @@ -688,7 +688,7 @@ Function1704e1: ; 1704e1 ld a, [wJumptableIndex] ld e, a ld d, 0 - ld hl, .jumptable + ld hl, .dw rept 2 add hl, de endr @@ -698,7 +698,7 @@ endr jp [hl] ; 17051f -.jumptable: ; 17051f +.dw: ; 17051f dw .Jumptable_0 dw .Jumptable_1 dw .Jumptable_2 @@ -945,7 +945,7 @@ BattleTowerAction: ; 170687 ld a, [ScriptVar] ld e, a ld d, 0 - ld hl, .jumptable + ld hl, .dw rept 2 add hl, de endr @@ -956,7 +956,7 @@ endr ; 170696 -.jumptable: ; 170696 (5c:4696) +.dw: ; 170696 (5c:4696) dw Function17075f ; 0x00 dw Function170788 ; 0x01 dw Function170778 ; 0x02 diff --git a/misc/fixed_words.asm b/misc/fixed_words.asm index d1706778a..c82c0d3e3 100755 --- a/misc/fixed_words.asm +++ b/misc/fixed_words.asm @@ -281,9 +281,9 @@ Function11c1ca: ; 11c1ca ld [wcf65], a ld [wcf66], a ld [wcd23], a - ld [BGMapBuffer], a + ld [wcd20], a ld [wcd21], a - ld [CreditsTimer], a + ld [wcd22], a ld [wcd35], a ld [wcd2b], a ld a, $ff @@ -373,17 +373,7 @@ Function11c283: ; 11c283 ; 11c2ac .DoJumptableFunction: ; 11c2ac - ld a, [wJumptableIndex] - ld e, a - ld d, 0 - ld hl, .Jumptable -rept 2 - add hl, de -endr - ld a, [hli] - ld h, [hl] - ld l, a - jp [hl] + jumptable .Jumptable, wJumptableIndex ; 11c2bb @@ -470,12 +460,10 @@ Function11c346: ; 11c346 (47:4346) Function11c35f: ; 11c35f (47:435f) ld hl, wcd2f -rept 2 inc [hl] -endr -rept 2 + inc [hl] + dec hl dec hl -endr dec [hl] push af ld de, wcd2d @@ -486,12 +474,10 @@ endr Function11c373: ; 11c373 (47:4373) ld hl, wcd30 -rept 2 inc [hl] -endr -rept 2 + inc [hl] + dec hl dec hl -endr dec [hl] push af ld de, wcd2d @@ -563,7 +549,7 @@ Function11c3c2: ; 11c3c2 (47:43c2) call Function11cfb5 Function11c3ed: ; 11c3ed (47:43ed) - ld hl, BGMapBuffer ; wcd20 (aliases: CreditsPos) + ld hl, wcd20 ; wcd20 (aliases: CreditsPos) ld de, hJoypadPressed ; $ffa3 ld a, [de] and $8 @@ -597,10 +583,10 @@ Function11c3ed: ; 11c3ed (47:43ed) jr .asm_11c475 .asm_11c426 ld a, $8 - ld [BGMapBuffer], a ; wcd20 (aliases: CreditsPos) + ld [wcd20], a ; wcd20 (aliases: CreditsPos) ret .asm_11c42c - ld a, [BGMapBuffer] ; wcd20 (aliases: CreditsPos) + ld a, [wcd20] ; wcd20 (aliases: CreditsPos) cp $6 jr c, .asm_11c472 sub $6 @@ -689,7 +675,7 @@ Function11c4a5: ; 11c4a5 (47:44a5) ret .asm_11c4b7 xor a - ld [CreditsTimer], a + ld [wcd22], a ld a, $15 ret @@ -780,7 +766,7 @@ Function11c53d: ; 11c53d (47:453d) ld hl, wcd24 set 0, [hl] ld a, $8 - ld [BGMapBuffer], a ; wcd20 (aliases: CreditsPos) + ld [wcd20], a ; wcd20 (aliases: CreditsPos) .b ld a, $4 @@ -808,7 +794,7 @@ Function11c53d: ; 11c53d (47:453d) ret .asm_11c5ab - ld a, [BGMapBuffer] ; wcd20 (aliases: CreditsPos) + ld a, [wcd20] ; wcd20 (aliases: CreditsPos) call Function11ca6a call PlayClickSFX ret @@ -1131,12 +1117,11 @@ Function11c770: ; 11c770 (47:4770) jr .asm_11c795 .asm_11c7ab ld hl, $c68a + 30 - ld a, [CreditsTimer] + ld a, [wcd22] ld c, a ld b, 0 -rept 2 add hl, bc -endr + add hl, bc ld a, [hl] ld [wcd28], a jr .asm_11c79f @@ -1211,9 +1196,8 @@ Function11c7bc: ; 11c7bc (47:47bc) ld a, [wcd22] ld e, a ld d, $0 -rept 2 add hl, de -endr + add hl, de ld a, [hli] ld e, a ld a, [hl] @@ -1223,9 +1207,8 @@ endr ld a, [wcd26] ld e, a ld d, $0 -rept 2 add hl, de -endr + add hl, de ld a, [wcd26] ld e, a .asm_11c831 @@ -1368,7 +1351,7 @@ MobileString_Next: ; 11c8f3 ; 11c8f6 Function11c8f6: ; 11c8f6 (47:48f6) - ld a, [BGMapBuffer] ; wcd20 (aliases: CreditsPos) + ld a, [wcd20] ; wcd20 (aliases: CreditsPos) call Function11c95d push hl ld a, [wcd2b] @@ -1388,13 +1371,12 @@ Function11c8f6: ; 11c8f6 (47:48f6) push de call Function11c05d pop de - ld a, [BGMapBuffer] ; wcd20 (aliases: CreditsPos) + ld a, [wcd20] ; wcd20 (aliases: CreditsPos) ld c, a ld b, $0 ld hl, wcd36 -rept 2 add hl, bc -endr + add hl, bc ld [hl], e inc hl ld [hl], d @@ -1414,9 +1396,8 @@ endr ld a, [wcd22] ld e, a ld d, $0 -rept 2 add hl, de -endr + add hl, de ld a, [hli] ld e, a ld a, [hl] @@ -1426,14 +1407,12 @@ endr ld a, [wcd26] ld e, a ld d, $0 -rept 2 add hl, de -endr + add hl, de ld a, [wcd25] ld e, a -rept 2 add hl, de -endr + add hl, de ld a, [hli] ld e, a ld a, [hl] @@ -1534,7 +1513,7 @@ Function11c9c3: ; 11c9c3 (47:49c3) jr nz, .asm_11c9e9 call Function11ca5e xor a - ld [BGMapBuffer], a ; wcd20 (aliases: CreditsPos) + ld [wcd20], a ; wcd20 (aliases: CreditsPos) .asm_11c9e9 ld hl, wcd24 set 4, [hl] @@ -1621,9 +1600,8 @@ Function11ca6a: ; 11ca6a (47:4a6a) ld hl, wcd36 ld c, a ld b, $0 -rept 2 add hl, bc -endr + add hl, bc ld [hl], b inc hl ld [hl], b @@ -1737,9 +1715,8 @@ Function11cb52: ; 11cb52 (47:4b52) .asm_11cb58 dec a jr z, .asm_11cb5f -rept 2 inc hl -endr + inc hl jr .asm_11cb58 .asm_11cb5f ld a, [hli] @@ -1798,9 +1775,8 @@ Function11cb66: ; 11cb66 (47:4b66) .asm_11cbba dec a jr z, .asm_11cbc1 -rept 2 inc hl -endr + inc hl jr .asm_11cbba .asm_11cbc1 ld a, [hli] @@ -2044,7 +2020,7 @@ Function11ce0b: ; 11ce0b (47:4e0b) call Function11cfb5 Function11ce2b: ; 11ce2b (47:4e2b) - ld a, [CreditsTimer] + ld a, [wcd22] sla a sla a ld c, a @@ -2083,7 +2059,7 @@ Function11ce2b: ; 11ce2b (47:4e2b) ret .a - ld a, [CreditsTimer] + ld a, [wcd22] cp NUM_KANA jr c, .place sub NUM_KANA @@ -2096,7 +2072,7 @@ Function11ce2b: ; 11ce2b (47:4e2b) ld hl, wcd24 set 0, [hl] ld a, $8 - ld [BGMapBuffer], a ; wcd20 (aliases: CreditsPos) + ld [wcd20], a ; wcd20 (aliases: CreditsPos) .b ld a, $4 jr .load @@ -2122,7 +2098,7 @@ Function11ce2b: ; 11ce2b (47:4e2b) ret .asm_11cea4 - ld a, [BGMapBuffer] ; wcd20 (aliases: CreditsPos) + ld a, [wcd20] ; wcd20 (aliases: CreditsPos) call Function11ca6a call PlayClickSFX ret @@ -2137,7 +2113,7 @@ Function11ce2b: ; 11ce2b (47:4e2b) ld a, [hl] cp $ff ret z - ld [CreditsTimer], a + ld [wcd22], a ret ; 11ceb9 (47:4eb9) @@ -2253,9 +2229,8 @@ Function11cfce: ; 11cfce (47:4fce) ld [hli], a ld a, [de] inc de -rept 2 dec a -endr + dec a jr z, .asm_11cff6 ld c, a ld a, $7a @@ -2271,9 +2246,8 @@ endr add hl, bc ld a, [de] dec de -rept 2 dec a -endr + dec a jr z, .asm_11d022 ld b, a .asm_11d005 @@ -2281,9 +2255,8 @@ endr ld a, $7c ld [hli], a ld a, [de] -rept 2 dec a -endr + dec a jr z, .asm_11d015 ld c, a ld a, $7f @@ -2305,9 +2278,8 @@ endr ld a, $7d ld [hli], a ld a, [de] -rept 2 dec a -endr + dec a jr z, .asm_11d031 ld c, a ld a, $7a @@ -2369,9 +2341,8 @@ Function11d035: ; 11d035 (47:5035) ld a, [de] cp $2 jr z, .asm_11d082 -rept 2 dec a -endr + dec a .asm_11d078 push af ld a, $7a @@ -2397,9 +2368,8 @@ endr cp $2 ret z push bc -rept 2 dec a -endr + dec a ld c, a ld b, a ld de, $14 @@ -2429,78 +2399,76 @@ Function11d0ac: ; 11d0ac (47:50ac) ret Function11d0b6: ; 11d0b6 (47:50b6) - ld hl, $c + ld hl, SPRITEANIMSTRUCT_0C add hl, bc ld a, [hl] ld e, a ld d, 0 - ld hl, Jumptable_11d0c7 -rept 2 + ld hl, .Jumptable + add hl, de add hl, de -endr ld a, [hli] ld h, [hl] ld l, a jp [hl] -Jumptable_11d0c7: ; 11d0c7 (47:50c7) - dw Function11d0dd - dw Function11d0e9 - dw Function11d0f5 - dw Function11d10f - dw Function11d134 - dw Function11d145 - dw Function11d156 - dw Function11d175 - dw Function11d1d7 - dw Function11d1d1 - dw Function11d1fc - - -Function11d0dd: ; 11d0dd (47:50dd) - ld a, [BGMapBuffer] ; wcd20 (aliases: CreditsPos) +.Jumptable + dw .zero + dw .one + dw .two + dw .three + dw .four + dw .five + dw .six + dw .seven + dw .eight + dw .nine + dw .ten + + +.zero: ; 11d0dd (47:50dd) + ld a, [wcd20] ; wcd20 (aliases: CreditsPos) sla a ld hl, Unknown_11d208 ld e, $1 - jr asm_11d11e + jr .load -Function11d0e9: ; 11d0e9 (47:50e9) +.one: ; 11d0e9 (47:50e9) ld a, [wcd21] sla a ld hl, Unknown_11d21a ld e, $2 - jr asm_11d11e + jr .load -Function11d0f5: ; 11d0f5 (47:50f5) +.two: ; 11d0f5 (47:50f5) ld hl, Unknown_11d2be - ld a, [CreditsTimer] + ld a, [wcd22] ld e, a ld d, $0 add hl, de ld a, [hl] call ReinitSpriteAnimFrame - ld a, [CreditsTimer] + ld a, [wcd22] sla a ld hl, Unknown_11d23e ld e, $4 - jr asm_11d11e + jr .load -Function11d10f: ; 11d10f (47:510f) - ld a, $27 +.three: ; 11d10f (47:510f) + ld a, SPRITE_ANIM_FRAMESET_27 call ReinitSpriteAnimFrame ld a, [wcd25] sla a ld hl, Unknown_11d29e ld e, $8 - -asm_11d11e: ; 11d11e (47:511e) +.load: ; 11d11e (47:511e) push de ld e, a ld d, $0 add hl, de push hl pop de - ld hl, $4 + ld hl, SPRITEANIMSTRUCT_XCOORD add hl, bc ld a, [de] inc de @@ -2512,26 +2480,26 @@ asm_11d11e: ; 11d11e (47:511e) call Function11d2ee ret -Function11d134: ; 11d134 (47:5134) - ld a, $27 +.four: ; 11d134 (47:5134) + ld a, SPRITE_ANIM_FRAMESET_27 call ReinitSpriteAnimFrame ld a, [wcd2a] sla a ld hl, Unknown_11d2b6 ld e, $10 - jr asm_11d11e + jr .load -Function11d145: ; 11d145 (47:5145) - ld a, $27 +.five: ; 11d145 (47:5145) + ld a, SPRITE_ANIM_FRAMESET_27 call ReinitSpriteAnimFrame ld a, [wcd2c] sla a ld hl, Unknown_11d2ba ld e, $20 - jr asm_11d11e + jr .load -Function11d156: ; 11d156 (47:5156) - ld a, $2a +.six: ; 11d156 (47:5156) + ld a, SPRITE_ANIM_FRAMESET_2A call ReinitSpriteAnimFrame ld a, [wcd4a] sla a @@ -2548,14 +2516,14 @@ Function11d156: ; 11d156 (47:5156) call Function11d2ee ret -Function11d175: ; 11d175 (47:5175) +.seven: ; 11d175 (47:5175) ld a, [wcd4d] cp $4 jr z, .asm_11d180 - ld a, $28 + ld a, SPRITE_ANIM_FRAMESET_28 jr .asm_11d182 .asm_11d180 - ld a, $26 + ld a, SPRITE_ANIM_FRAMESET_26 .asm_11d182 call ReinitSpriteAnimFrame ld a, [wcd4d] @@ -2566,7 +2534,7 @@ Function11d175: ; 11d175 (47:5175) sla a sla a add $20 - ld hl, $4 + ld hl, SPRITEANIMSTRUCT_XCOORD add hl, bc ld [hli], a ld a, [wcd4d] @@ -2590,7 +2558,7 @@ Function11d175: ; 11d175 (47:5175) sla a add e add $18 - ld hl, $4 + ld hl, SPRITEANIMSTRUCT_XCOORD add hl, bc ld [hli], a ld a, $8a @@ -2600,16 +2568,15 @@ Function11d175: ; 11d175 (47:5175) call Function11d2ee ret -Function11d1d1: ; 11d1d1 (47:51d1) - ld d, $98 - ld a, $2c - jr asm_11d1db - -Function11d1d7: ; 11d1d7 (47:51d7) - ld d, $10 - ld a, $2b +.nine: ; 11d1d1 (47:51d1) + ld d, -13 * 8 + ld a, SPRITE_ANIM_FRAMESET_2C + jr .eight_nine_load -asm_11d1db: ; 11d1db (47:51db) +.eight: ; 11d1d7 (47:51d7) + ld d, 2 * 8 + ld a, SPRITE_ANIM_FRAMESET_2B +.eight_nine_load: ; 11d1db (47:51db) push de call ReinitSpriteAnimFrame ld a, [wcd4a] @@ -2619,8 +2586,8 @@ asm_11d1db: ; 11d1db (47:51db) ld e, a sla a add e - add $40 - ld hl, $5 + add 8 * 8 + ld hl, SPRITEANIMSTRUCT_YCOORD add hl, bc ld [hld], a pop af @@ -2630,8 +2597,8 @@ asm_11d1db: ; 11d1db (47:51db) call Function11d2ee ret -Function11d1fc: ; 11d1fc (47:51fc) - ld a, $26 +.ten: ; 11d1fc (47:51fc) + ld a, SPRITE_ANIM_FRAMESET_26 call ReinitSpriteAnimFrame ld a, $8 ld e, a @@ -3119,9 +3086,8 @@ Function11d4aa: ; 11d4aa ld hl, $0005 add hl, de ld a, [bc] -rept 2 inc bc -endr + inc bc push bc .asm_11d4cf push af @@ -3162,7 +3128,6 @@ endr SortedPokemon: ; Pokemon sorted by kana. ; Notably, Rhydon is missing. - dw .a dw .i dw .u diff --git a/misc/mobile_12.asm b/misc/mobile_12.asm index f6e0e00e1..48e740681 100755 --- a/misc/mobile_12.asm +++ b/misc/mobile_12.asm @@ -519,9 +519,8 @@ Mobile12_Bin2Dec: ; 48444 (12:4444) .loop and a jr z, .got_string -rept 2 inc hl -endr + inc hl dec a jr .loop .got_string @@ -746,9 +745,8 @@ Function486bf: ; 486bf (12:46bf) pop af ld [hli], a ld a, $1 -rept 2 ld [hli], a -endr + ld [hli], a xor a rept 3 ld [hli], a @@ -1673,12 +1671,10 @@ Function48cdc: ; 48cdc (12:4cdc) 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, $0 .asm_48ced push bc diff --git a/misc/mobile_22_2.asm b/misc/mobile_22_2.asm index 299c6643c..b14660d05 100644 --- a/misc/mobile_22_2.asm +++ b/misc/mobile_22_2.asm @@ -1,6 +1,6 @@ Function8b342:: ; 8b342 ; Loads the secondary map header pointer, then runs through a -; jumptable with three dummy functions. Spends a lot of energy +; dw with three dummy functions. Spends a lot of energy ; doing pretty much nothing. call GetSecondaryMapHeaderPointer ld d, h @@ -10,7 +10,7 @@ Function8b342:: ; 8b342 xor a .loop push af - ld hl, .jumptable + ld hl, .dw rst JumpTable pop af inc a @@ -19,7 +19,7 @@ Function8b342:: ; 8b342 ret ; 8b354 -.jumptable: ; 8b354 +.dw: ; 8b354 dw .zero dw .one dw .two diff --git a/misc/mobile_40.asm b/misc/mobile_40.asm index 5d2799f0f..5e933b7fc 100644 --- a/misc/mobile_40.asm +++ b/misc/mobile_40.asm @@ -67,7 +67,7 @@ Function100063: ; 100063 ld [BGMapBuffer], a xor a ld [hMapAnims], a - ld [hLCDStatCustom], a + ld [hFFC6], a ret ; 100082 @@ -84,7 +84,7 @@ Function100082: ; 100082 ld [rIE], a xor a ld [hMapAnims], a - ld [hLCDStatCustom], a + ld [hFFC6], a ld a, $1 ld [hMobileReceive], a ld [hMobile], a @@ -118,9 +118,8 @@ Function1000ba: ; 1000ba ld a, [wcd25] ld e, a ld d, 0 -rept 2 add hl, de -endr + add hl, de ld a, [wcd22] call GetFarHalfword ld a, [wcd22] @@ -1912,9 +1911,8 @@ Function100bc2: ; 100bc2 ld a, [wMenuCursorY] ld b, a ld a, [wNumMoves] -rept 2 inc a -endr + inc a cp b jp nz, .asm_100bcb ld a, $1 @@ -4746,9 +4744,8 @@ Function101ee2: ; 101ee2 Function101ee4: ; 101ee4 ld d, 0 ld hl, Unknown_101ef5 -rept 2 add hl, de -endr + add hl, de ld a, [hli] ld d, [hl] ld e, a @@ -7228,9 +7225,8 @@ endr inc hl push hl -rept 2 add a -endr + add a add Unknown_10327a % $100 ld l, a @@ -7693,9 +7689,8 @@ Function1035c6: ; 1035c6 callba Function10138b ld b, 0 ld hl, Unknown_1035d7 -rept 2 add hl, bc -endr + add hl, bc ld a, [hli] ld h, [hl] ld l, a @@ -7708,7 +7703,6 @@ Unknown_1035d7: ; 1035d7 dw Unknown_103608 dw Unknown_103608 dw Unknown_1035fe - dw AskMobileOrCable dw AskMobileOrCable dw AskMobileOrCable @@ -8096,9 +8090,8 @@ Function10383c: ; 10383c ld [wdc60], a xor a ld hl, wdc5c -rept 2 ld [hli], a -endr + ld [hli], a ld [hl], a ld hl, UnknownText_0x103876 call PrintText diff --git a/misc/mobile_42.asm b/misc/mobile_42.asm index a4a41d439..f5ed53c81 100644 --- a/misc/mobile_42.asm +++ b/misc/mobile_42.asm @@ -382,27 +382,27 @@ endr ; 10828a .Jumptable: ; 10828a - jumptable_start - jumptable GetMobileTradeAnimByte ; 00 - jumptable MobileTradeAnim_ShowPlayerMonToBeSent ; 01 - jumptable MobileTradeAnim_02 ; 02 - jumptable MobileTradeAnim_GiveTrademon1 ; 03 - jumptable MobileTradeAnim_GiveTrademon2 ; 04 - jumptable MobileTradeAnim_05 ; 05 - jumptable MobileTradeAnim_06 ; 06 - jumptable MobileTradeAnim_07 ; 07 - jumptable MobileTradeAnim_GetTrademon1 ; 08 - jumptable MobileTradeAnim_GetTrademon2 ; 09 - jumptable MobileTradeAnim_GetTrademon3 ; 0a - jumptable MobileTradeAnim_ShowOTMonFromTrade ; 0b - jumptable EndMobileTradeAnim ; 0c - jumptable MobileTradeAnim_ShowPlayerMonForGTS ; 0d - jumptable MobileTradeAnim_ShowOTMonFromGTS ; 0e - jumptable MobileTradeAnim_0f ; 0f - jumptable MobileTradeAnim_10 ; 10 - jumptable MobileTradeAnim_11 ; 11 - jumptable MobileTradeAnim_FadeToBlack ; 12 - jumptable MobileTradeAnim_GetOddEgg ; 13 get odd egg + + dw GetMobileTradeAnimByte ; 00 + dw MobileTradeAnim_ShowPlayerMonToBeSent ; 01 + dw MobileTradeAnim_02 ; 02 + dw MobileTradeAnim_GiveTrademon1 ; 03 + dw MobileTradeAnim_GiveTrademon2 ; 04 + dw MobileTradeAnim_05 ; 05 + dw MobileTradeAnim_06 ; 06 + dw MobileTradeAnim_07 ; 07 + dw MobileTradeAnim_GetTrademon1 ; 08 + dw MobileTradeAnim_GetTrademon2 ; 09 + dw MobileTradeAnim_GetTrademon3 ; 0a + dw MobileTradeAnim_ShowOTMonFromTrade ; 0b + dw EndMobileTradeAnim ; 0c + dw MobileTradeAnim_ShowPlayerMonForGTS ; 0d + dw MobileTradeAnim_ShowOTMonFromGTS ; 0e + dw MobileTradeAnim_0f ; 0f + dw MobileTradeAnim_10 ; 10 + dw MobileTradeAnim_11 ; 11 + dw MobileTradeAnim_FadeToBlack ; 12 + dw MobileTradeAnim_GetOddEgg ; 13 get odd egg ; 1082b2 MobileTradeAnim_Next: ; 1082b2 diff --git a/misc/mobile_46.asm b/misc/mobile_46.asm index a40829250..fd9b85e4f 100755 --- a/misc/mobile_46.asm +++ b/misc/mobile_46.asm @@ -564,17 +564,7 @@ Function118473: ; 118473 ; 1184a5 Function1184a5: ; 1184a5 - ld a, [wcf66] - ld e, a - ld d, 0 - ld hl, .Jumptable -rept 2 - add hl, de -endr - ld a, [hli] - ld h, [hl] - ld l, a - jp [hl] + jumptable .Jumptable, wcf66 ; 1184b4 .Jumptable: ; 1184b4 @@ -609,17 +599,7 @@ endr ; 1184ec Function1184ec: ; 1184ec - ld a, [wcf66] - ld e, a - ld d, 0 - ld hl, .Jumptable -rept 2 - add hl, de -endr - ld a, [hli] - ld h, [hl] - ld l, a - jp [hl] + jumptable .Jumptable, wcf66 ; 1184fb .Jumptable: ; 1184fb @@ -667,17 +647,7 @@ endr ; 11854d Function11854d: ; 11854d - ld a, [wcf66] - ld e, a - ld d, 0 - ld hl, .Jumptable -rept 2 - add hl, de -endr - ld a, [hli] - ld h, [hl] - ld l, a - jp [hl] + jumptable .Jumptable, wcf66 ; 11855c .Jumptable: ; 11855c @@ -700,17 +670,7 @@ endr ; 11857c Function11857c: ; 11857c - ld a, [wcf66] - ld e, a - ld d, 0 - ld hl, .Jumptable -rept 2 - add hl, de -endr - ld a, [hli] - ld h, [hl] - ld l, a - jp [hl] + jumptable .Jumptable, wcf66 ; 11858b .Jumptable: ; 11858b @@ -745,17 +705,7 @@ endr ; 1185c3 Function1185c3: ; 1185c3 - ld a, [wcf66] - ld e, a - ld d, 0 - ld hl, .Jumptable -rept 2 - add hl, de -endr - ld a, [hli] - ld h, [hl] - ld l, a - jp [hl] + jumptable .Jumptable, wcf66 ; 1185d2 .Jumptable: ; 1185d2 @@ -803,17 +753,7 @@ endr ; 118624 Function118624: ; 118624 - ld a, [wcf66] - ld e, a - ld d, 0 - ld hl, .Jumptable -rept 2 - add hl, de -endr - ld a, [hli] - ld h, [hl] - ld l, a - jp [hl] + jumptable .Jumptable, wcf66 ; 118633 .Jumptable: ; 118633 @@ -851,17 +791,7 @@ endr ; 118671 Function118671: ; 118671 - ld a, [wcf66] - ld e, a - ld d, 0 - ld hl, .Jumptable -rept 2 - add hl, de -endr - ld a, [hli] - ld h, [hl] - ld l, a - jp [hl] + jumptable .Jumptable, wcf66 ; 118680 .Jumptable: ; 118680 @@ -893,17 +823,7 @@ endr ; 1186b2 Function1186b2: ; 1186b2 - ld a, [wcf66] - ld e, a - ld d, 0 - ld hl, .Jumptable -rept 2 - add hl, de -endr - ld a, [hli] - ld h, [hl] - ld l, a - jp [hl] + jumptable .Jumptable, wcf66 ; 1186c1 .Jumptable: ; 1186c1 @@ -936,17 +856,7 @@ endr ; 1186f5 Function1186f5: ; 1186f5 (46:46f5) - ld a, [wcf66] - ld e, a - ld d, 0 - ld hl, .Jumptable -rept 2 - add hl, de -endr - ld a, [hli] - ld h, [hl] - ld l, a - jp [hl] + jumptable .Jumptable, wcf66 ; 118704 (46:4704) .Jumptable: ; 118704 (46:4704) @@ -986,17 +896,7 @@ endr ; 118746 (46:4746) Function118746: ; 118746 - ld a, [wcf66] - ld e, a - ld d, 0 - ld hl, .Jumptable -rept 2 - add hl, de -endr - ld a, [hli] - ld h, [hl] - ld l, a - jp [hl] + jumptable .Jumptable, wcf66 ; 118755 .Jumptable: ; 118755 @@ -1627,9 +1527,8 @@ Function118b8c: ; 118b8c jr nz, .asm_118b8c dec hl xor a -rept 2 ld [hli], a -endr + ld [hli], a ret ; 118b9a @@ -1830,9 +1729,8 @@ asm_118e3e ld a, [hld] cp $2f jr nz, .asm_118e3e -rept 2 inc hl -endr + inc hl ld de, wcd85 ld c, $4 .asm_118e4a @@ -2691,9 +2589,8 @@ Function119413: ; 119413 ld c, a ld a, [w3_d000 + 1] ld b, a -rept 2 dec bc -endr + dec bc ld hl, wd002 ld a, [hli] ld e, a @@ -2883,9 +2780,8 @@ endr .asm_119552 inc hl .asm_119553 -rept 2 inc hl -endr + inc hl jr .asm_11955b .asm_119557 ld de, $14 @@ -3230,9 +3126,8 @@ Function1196f2: ; 1196f2 ld a, [hld] cp $58 jr z, .asm_11975b -rept 2 inc hl -endr + inc hl ld a, d dec a jr z, .asm_11978e @@ -3815,9 +3710,8 @@ Function119b6b: ; 119b6b ld a, [de] cp $d jr nz, .asm_119b85 -rept 2 inc de -endr + inc de .asm_119b93 ld a, [de] inc de @@ -4349,28 +4243,19 @@ Function119ed8: ; 119ed8 (46:5ed8) ld [wcd8c], a ld a, $1 ld [rSVBK], a - call Function119eee + + call .RunJumptable + ld a, [wcd8c] ld [rSVBK], a ld a, $1 ld [hBGMapMode], a ret -Function119eee: ; 119eee (46:5eee) - ld a, [wcd3c] - ld e, a - ld d, 0 - ld hl, Jumptable_119efd -rept 2 - add hl, de -endr - ld a, [hli] - ld h, [hl] - ld l, a - jp [hl] -; 119efd (46:5efd) +.RunJumptable + jumptable .Jumptable, wcd3c -Jumptable_119efd: ; 119efd +.Jumptable dw Function119f3f dw Function119f45 dw Function119f56 @@ -5553,17 +5438,7 @@ endr ; 11a8fa Function11a8fa: ; 11a8fa - ld a, [$c31a] - ld e, a - ld d, 0 - ld hl, .Jumptable -rept 2 - add hl, de -endr - ld a, [hli] - ld h, [hl] - ld l, a - jp [hl] + jumptable .Jumptable, $c31a ; 11a909 .Jumptable: ; 11a909 @@ -6328,9 +6203,8 @@ asm_11afbd: dec a ld c, a ld b, 0 -rept 2 add hl, bc -endr + add hl, bc ld a, e ld e, [hl] inc hl @@ -6803,9 +6677,8 @@ Function11b236: ; 11b236 Function11b239: ; 11b239 ld e, a ld d, 0 -rept 2 add hl, de -endr + add hl, de ld a, [hli] ld h, [hl] ld l, a @@ -7210,20 +7083,9 @@ Function11b45c: ; 11b45c ; 11b46a Function11b46a: ; 11b46a - ld a, [wJumptableIndex] - ld e, a - ld d, 0 - ld hl, Jumptable_11b479 -rept 2 - add hl, de -endr - ld a, [hli] - ld h, [hl] - ld l, a - jp [hl] -; 11b479 + jumptable .Jumptable, wJumptableIndex -Jumptable_11b479: ; 11b479 +.Jumptable dw Function11b483 dw Function11b570 dw Function11b5c0 @@ -7232,7 +7094,7 @@ Jumptable_11b479: ; 11b479 ; 11b483 Function11b483: ; 11b483 - call Function11b538 + call .InitRAM ld hl, PlayerName ld a, $5 ; Japanese Name Length .loop1 @@ -7291,9 +7153,8 @@ Function11b483: ; 11b483 pop de ld h, d ld l, e -rept 2 dec hl -endr + dec hl ld a, [de] ld [hli], a inc de @@ -7369,9 +7230,8 @@ endr jr nz, .loop9 call CloseSRAM jp Function11ad8a -; 11b538 -Function11b538: ; 11b538 +.InitRAM ld bc, wc626 ld a, [PlayerID] ld [wcd2a], a @@ -7416,26 +7276,28 @@ Function11b570: ; 11b570 ld a, [ScriptVar] and a jr nz, .exit - call Function11b585 + call .SaveData jp Function11ad8a .exit ld a, $4 ld [wJumptableIndex], a ret -; 11b585 -Function11b585: ; 11b585 +.SaveData ld a, $3 ld [rSVBK], a + ld hl, w3_d800 ld de, $c608 ld bc, w3_d88f - w3_d800 call CopyBytes + ld a, $1 ld [rSVBK], a ld a, $5 call GetSRAMBank + ld de, $a800 ld a, $1 ld [de], a @@ -7443,8 +7305,10 @@ Function11b585: ; 11b585 ld hl, $c608 ld bc, w3_d88f - w3_d800 call CopyBytes + push de pop hl + ld a, [hRTCMinutes] ld [hli], a ld a, [hRTCHours] @@ -7453,6 +7317,7 @@ Function11b585: ; 11b585 ld [hli], a ld a, [hRTCDayHi] ld [hl], a + call CloseSRAM ret ; 11b5c0 @@ -7484,14 +7349,14 @@ Function11b5e8: ; 11b5e8 call GetSRAMBank ld hl, wRTC ld de, $c608 - ld bc, $0004 + ld bc, 4 call CopyBytes call CloseSRAM ld a, $5 call GetSRAMBank ld hl, $c608 ld de, $b08c - ld bc, $0004 + ld bc, 4 call CopyBytes ld a, $2 ld [$a800], a @@ -7513,35 +7378,20 @@ Function11b5e8: ; 11b5e8 ld [wcd31], a call CloseSRAM call Function11b44b - call Function11b64c + call .loop ret -; 11b64c -Function11b64c: ; 11b64c -.asm_11b64c - call Function11b65a +.loop + call .RunJumptable call DelayFrame ld a, [wJumptableIndex] cp $1 - jr nz, .asm_11b64c + jr nz, .loop ret -; 11b65a - -Function11b65a: ; 11b65a - ld a, [wJumptableIndex] - ld e, a - ld d, 0 - ld hl, Jumptable_11b669 -rept 2 - add hl, de -endr - ld a, [hli] - ld h, [hl] - ld l, a - jp [hl] -; 11b669 -Jumptable_11b669: ; 11b669 +.RunJumptable + jumptable .Jumptable, wJumptableIndex +.Jumptable dw Function11b66d dw Function11b6b3 ; 11b66d diff --git a/misc/mobile_5f.asm b/misc/mobile_5f.asm index 74be85b47..204ea7371 100644 --- a/misc/mobile_5f.asm +++ b/misc/mobile_5f.asm @@ -733,17 +733,7 @@ Function17d45a: ; 17d45a ; 17d474 Function17d474: ; 17d474 - ld a, [wcd77] - ld e, a - ld d, 0 - ld hl, Jumptable_17d483 -rept 2 - add hl, de -endr - ld a, [hli] - ld h, [hl] - ld l, a - jp [hl] + jumptable Jumptable_17d483, wcd77 ; 17d483 Jumptable_17d483: ; 17d483 @@ -920,16 +910,14 @@ Function17d48d: ; 17d48d ld a, [wcd42] ld c, a ld b, $0 -rept 2 add hl, bc -endr + add hl, bc ld a, l ld [wcd4b], a ld a, h ld [wcd4c], a -rept 2 add hl, bc -endr + add hl, bc ld a, l ld [wcd4d], a ld a, h @@ -955,9 +943,8 @@ Function17d5c4: .loop srl a jr c, .got_button -rept 2 inc c -endr + inc c jr .loop .got_button @@ -1044,12 +1031,10 @@ Function17d60b: ; 17d60b ld [wcd4c], a pop de pop hl -rept 2 inc b -endr -rept 2 + inc b + dec c dec c -endr jr z, .asm_17d684 push bc push de @@ -1095,17 +1080,15 @@ Function17d6a1: ; 17d6a1 ld a, $5 call GetSRAMBank ld hl, $b1d3 -rept 2 add hl, bc -endr + add hl, bc ld a, [hli] ld [wcd47], a ld a, [hl] ld [BGMapPalBuffer], a ld hl, $b1b3 -rept 2 add hl, bc -endr + add hl, bc ld a, [hli] ld c, a ld a, [hl] @@ -1121,9 +1104,8 @@ endr ld de, wcd60 ld bc, $0004 call CopyBytes -rept 2 inc hl -endr + inc hl ld de, wcd64 ld bc, $0004 call CopyBytes @@ -1159,9 +1141,8 @@ Function17d711: ld e, a ld d, 0 ld hl, Jumptable17d72a -rept 2 add hl, de -endr + add hl, de ld a, [hli] ld h, [hl] ld l, a @@ -2015,9 +1996,8 @@ Function17dccf: ; 17dccf ld a, [wcd2e] ld c, a ld b, $0 -rept 2 add hl, bc -endr + add hl, bc ld a, [hli] ld c, a ld a, [hl] @@ -2432,9 +2412,8 @@ Function17ded9: ; 17ded9 jr .asm_17df7b .asm_17df79 -rept 2 inc hl -endr + inc hl .asm_17df7b bit 4, b @@ -2487,9 +2466,8 @@ endr jr .asm_17dfd2 .asm_17dfd0 -rept 2 inc hl -endr + inc hl .asm_17dfd2 bit 5, b @@ -2614,9 +2592,8 @@ Function17e026: ; 17e026 jr .asm_17e0a4 .asm_17e0a2 -rept 2 inc hl -endr + inc hl .asm_17e0a4 bit 4, b @@ -2632,9 +2609,8 @@ endr jr .asm_17e0b6 .asm_17e0b4 -rept 2 inc hl -endr + inc hl .asm_17e0b6 bit 5, b @@ -2656,9 +2632,8 @@ endr call CloseSRAM pop hl pop bc -rept 2 inc hl -endr + inc hl jr asm_17e0ee .asm_17e0e1 @@ -2703,9 +2678,8 @@ Function17e0fd: ; 17e0fd call ReceiveItem pop hl jr c, .asm_17e127 -rept 2 inc hl -endr + inc hl .asm_17e127 ld a, [hli] @@ -2735,9 +2709,8 @@ Function17e133: ; 17e133 callba MobileCheckOwnMonAnywhere pop hl jr c, .asm_17e159 -rept 2 inc hl -endr + inc hl .asm_17e159 ld a, [hli] @@ -2773,9 +2746,8 @@ Function17e165: ; 17e165 call CheckItem pop hl jr c, .asm_17e195 -rept 2 inc hl -endr + inc hl .asm_17e195 ld a, [hli] @@ -3240,9 +3212,8 @@ Function17e451: ; 17e451 ld [wcd2e], a ld c, a ld b, $0 -rept 2 add hl, bc -endr + add hl, bc push hl hlcoord 0, 0 ld bc, $0014 @@ -3467,9 +3438,8 @@ Function17e5af: ; 17e5af ld l, a ld a, [wcd4e] ld h, a -rept 2 add hl, bc -endr + add hl, bc ld a, [hli] ld e, a ld a, [hli] @@ -3534,9 +3504,8 @@ Function17e613: ; 17e613 ld [hli], a ld a, [de] inc de -rept 2 dec a -endr + dec a jr z, .asm_17e63f ld c, a ld a, [wcd53] @@ -3555,9 +3524,8 @@ endr add hl, bc ld a, [de] dec de -rept 2 dec a -endr + dec a jr z, .asm_17e674 ld b, a .asm_17e651 @@ -3566,9 +3534,8 @@ endr add $3 ld [hli], a ld a, [de] -rept 2 dec a -endr + dec a jr z, .asm_17e664 ld c, a ld a, $7f @@ -3594,9 +3561,8 @@ endr add $5 ld [hli], a ld a, [de] -rept 2 dec a -endr + dec a jr z, .asm_17e689 ld c, a ld a, [wcd53] @@ -3622,9 +3588,8 @@ Function17e691: ; 17e691 inc de push af ld a, [de] -rept 2 inc de -endr + inc de and a .asm_17e69f jr z, .asm_17e6a5 @@ -3776,9 +3741,8 @@ Function17f047: ; 17f047 ld e, a ld d, 0 ld hl, Jumptable_17f061 -rept 2 add hl, de -endr + add hl, de ld a, [hli] ld h, [hl] ld l, a @@ -3815,9 +3779,8 @@ Function17f081: ; 17f081 ld de, $0004 add hl, de ld a, [hli] -rept 2 inc hl -endr + inc hl ld e, l ld d, h ld l, c @@ -3960,9 +3923,8 @@ Function17f154: ; 17f154 pop hl call Function17f524 jr c, .asm_17f167 -rept 2 inc hl -endr + inc hl ld e, l ld d, h ld a, [de] @@ -4150,9 +4112,8 @@ Function17f220: ; 17f220 ld e, a ld d, 0 ld hl, .Genders -rept 2 add hl, de -endr + add hl, de ld a, [hli] ld e, a ld a, [hl] @@ -4414,9 +4375,8 @@ Function17f3f0: ; 17f3f0 ld a, [de] ld c, a ld b, $0 -rept 2 add hl, bc -endr + add hl, bc ld a, [hli] ld e, a ld a, [hli] @@ -4431,9 +4391,8 @@ endr ld e, a ld d, $0 pop hl -rept 2 add hl, de -endr + add hl, de rept 3 inc hl endr @@ -4497,9 +4456,8 @@ Function17f44f: ; 17f44f ld de, $0005 add hl, de ld a, [hli] -rept 2 inc hl -endr + inc hl ld e, l ld d, h ld l, c @@ -4738,17 +4696,7 @@ Function17f56e: ; 17f56e ; 17f5ae Function17f5ae: ; 17f5ae - ld a, [wc303] - ld e, a - ld d, 0 - ld hl, Table17f5bd -rept 2 - add hl, de -endr - ld a, [hli] - ld h, [hl] - ld l, a - jp [hl] + jumptable Table17f5bd, wc303 ; 17f5bd Table17f5bd: ; 17f5bd @@ -4818,9 +4766,8 @@ Function17f5e4: ; 17f5e4 ld e, a ld d, $0 ld hl, Table_17f706 -rept 2 add hl, de -endr + add hl, de ld a, [wc301] ld e, a ld a, [wc302] @@ -4858,9 +4805,8 @@ endr jr .asm_17f67d .asm_17f674 -rept 2 inc hl -endr + inc hl dec c jr nz, .asm_17f65d @@ -4878,9 +4824,8 @@ endr ld e, a ld d, 0 ld hl, Table_17f699 -rept 2 add hl, de -endr + add hl, de ld a, [hli] ld e, a ld a, [hl] diff --git a/misc/mobile_menu.asm b/misc/mobile_menu.asm index 6291960e5..8975a5151 100755 --- a/misc/mobile_menu.asm +++ b/misc/mobile_menu.asm @@ -162,9 +162,8 @@ MobileMenu_InitMenuBuffers: ; 4a071 (12:6071) add B_BUTTON ld [hli], a ; wMenuJoypadFilter ld a, 1 -rept 2 ld [hli], a ; wMenuCursorY, wMenuCursorX -endr + ld [hli], a ; wMenuCursorY, wMenuCursorX ret Function4a098: ; 4a098 (12:6098) @@ -246,9 +245,8 @@ Function4a118: ; 4a118 (12:6118) add $2 ld [hli], a ld a, $1 -rept 2 ld [hli], a -endr + ld [hli], a ret Function4a13b: ; 4a13b (12:613b) @@ -523,9 +521,8 @@ Function4a373: ; 4a373 (12:6373) add $2 ld [hli], a ld a, $1 -rept 2 ld [hli], a -endr + ld [hli], a ret ; 4a39a (12:639a) @@ -836,9 +833,8 @@ Function4a680: ; 4a680 (12:6680) add $2 ld [hli], a ld a, $1 -rept 2 ld [hli], a -endr + ld [hli], a xor a rept 3 ld [hli], a |