pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-12-11 05:02:16 -08:00
Code Issues Packages Projects Releases Wiki Activity

jumptable macro repurposed

Browse Source
This commit is contained in:
PikalaxALT
2015-12-26 21:59:03 -05:00
parent 2bd45ca574
commit f030315b1f
66 changed files with 1241 additions and 1759 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
misc/battle_tower_5c.asm
View File

@@ -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

219
misc/fixed_words.asm
View File

File diff suppressed because it is too large Load Diff

12
misc/mobile_12.asm
View File

@@ -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

6
misc/mobile_22_2.asm
View File

@@ -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

23
misc/mobile_40.asm
View File

@@ -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

42
misc/mobile_42.asm
View File

@@ -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

244
misc/mobile_46.asm
View File

@@ -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

129
misc/mobile_5f.asm
View File

@@ -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]

12
misc/mobile_menu.asm
View File

@@ -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