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

* more callab/callba macros

Browse Source
This commit is contained in:
Mr Wint 2013-10-02 02:47:54 +02:00
parent fa673df4fa
commit eb5a7afe2b
12 changed files with 108 additions and 249 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
battle/effect_commands.asm
View File

@ -4469,9 +4469,7 @@ BattleCommand40: ; 35813
ret z ret z
ld b, a ld b, a
ld hl, $45ec callab Function3c5ec
ld a, $f
rst FarCall
ld a, b ld a, b
cp $59 cp $59
@ -4668,9 +4666,7 @@ BattleCommand42: ; 35926
ld hl, $c4ca ld hl, $c4ca
ld a, $b ld a, $b
call Predef call Predef
ld a, $5e callba Function178000
ld hl, $4000
rst FarCall
ld hl, SharedPainText ld hl, SharedPainText
jp StdBattleTextBox jp StdBattleTextBox
@ -5324,9 +5320,7 @@ PlayFXAnimID: ; 35d08
ld c, 3 ld c, 3
call DelayFrames call DelayFrames
ld hl, $40d6 callab Functioncc0d6
ld a, $33
rst FarCall ; callab SafePlayBattleAnimation
ret ret
; 35d1c ; 35d1c
@ -5589,9 +5583,7 @@ BattleCommand14: ; 35e5c
ld hl, FellAsleepText ld hl, FellAsleepText
call StdBattleTextBox call StdBattleTextBox
ld a, $f callba Function3dde9
ld hl, $5de9
rst FarCall
jp z, Function0x34216 jp z, Function0x34216
ret ret
@ -5666,9 +5658,7 @@ BattleCommand13: ; 35eee
ld hl, WasPoisonedText ld hl, WasPoisonedText
call StdBattleTextBox call StdBattleTextBox
ld a, $f callba Function3dde9
ld hl, $5de9
rst FarCall
ret ret
; 35f2c ; 35f2c
@ -5742,9 +5732,7 @@ BattleCommand2f: ; 35f2c
call StdBattleTextBox call StdBattleTextBox
.asm_35fb1 .asm_35fb1
ld a, $f callba Function3dde9
ld hl, $5de9
rst FarCall
ret ret
.asm_35fb8 .asm_35fb8
@ -5940,9 +5928,7 @@ BattleCommand17: ; 3608c
ld hl, WasBurnedText ld hl, WasBurnedText
call StdBattleTextBox call StdBattleTextBox
ld a, $f callba Function3dde9
ld hl, $5de9
rst FarCall
ret ret
; 360dd ; 360dd
@ -6013,9 +5999,7 @@ BattleCommand18: ; 36102
ld hl, WasFrozenText ld hl, WasFrozenText
call StdBattleTextBox call StdBattleTextBox
ld a, $f callba Function3dde9
ld hl, $5de9
rst FarCall
ret nz ret nz
call Function0x34216 call Function0x34216
call EndRechargeOpp call EndRechargeOpp
@ -7300,9 +7284,7 @@ BattleCommand23: ; 3680f
ld a, d ld a, d
inc a inc a
ld [$c718], a ld [$c718], a
ld hl, $54c3 callab Function3d4c3
ld a, $f
rst FarCall
ld hl, DraggedOutText ld hl, DraggedOutText
call StdBattleTextBox call StdBattleTextBox
@ -8509,9 +8491,7 @@ BattleCommand35: ; 36f9d
BattleCommand36: ; 36fe1 BattleCommand36: ; 36fe1
call Function0x37e01 call Function0x37e01
ld a, $41 callba Function1060e5
ld hl, $60e5
rst FarCall
jp PrintNothingHappened jp PrintNothingHappened
; 36fed ; 36fed
@ -8701,9 +8681,7 @@ BattleCommand1f: ; 3707f
inc de inc de
ld [de], a ld [de], a
ld [$d265], a ld [$d265], a
ld a, $14 callba GetTypeName
ld hl, $4964
rst FarCall
call Function0x37e01 call Function0x37e01
ld hl, TransformedTypeText ld hl, TransformedTypeText
jp StdBattleTextBox jp StdBattleTextBox
@ -9137,9 +9115,7 @@ CheckSubstituteOpp: ; 37378
BattleCommand1a: ; 37380 BattleCommand1a: ; 37380
ld a, $41 callba Function10610d
ld hl, $610d
rst FarCall
ld a, $4 ld a, $4
ld [$cfca], a ld [$cfca], a
ld c, $3 ld c, $3
@ -9163,12 +9139,8 @@ BattleCommand1a: ; 37380
res 6, [hl] res 6, [hl]
call Function0x37ed5 call Function0x37ed5
ret nc ret nc
ld a, $f callba DrawPlayerHUD
ld hl, $5f58 callba Function3e043
rst FarCall
ld a, $f
ld hl, $6043
rst FarCall
call $31f6 call $31f6
jp RefreshBattleHuds jp RefreshBattleHuds
; 373c9 ; 373c9
@ -9822,9 +9794,7 @@ Function0x377f5: ; 377f5
xor a xor a
ld [MonType], a ld [MonType], a
ld a, $14 callba GetGender
ld hl, $4bdd
rst FarCall
jr c, .asm_37849 jr c, .asm_37849
ld b, 1 ld b, 1
@ -9848,9 +9818,7 @@ Function0x377f5: ; 377f5
ld [$d124], a ld [$d124], a
ld a, 3 ld a, 3
ld [MonType], a ld [MonType], a
ld a, $14 callba GetGender
ld hl, $4bdd
rst FarCall
pop bc pop bc
jr c, .asm_37849 jr c, .asm_37849
@ -9948,13 +9916,13 @@ BattleCommand61: ; 37874
ld [$c689], a ld [$c689], a
call Function0x37e01 call Function0x37e01
call SwitchTurn call SwitchTurn
ld hl, $5246 ld hl, AICheckPlayerMaxHP
ld a, [hBattleTurn] ld a, [hBattleTurn]
and a and a
jr z, .asm_378ce ; 378c9 $3 jr z, .asm_378ce ; 378c9 $3
ld hl, $5251 ld hl, AICheckEnemyMaxHP
.asm_378ce .asm_378ce
ld a, $e ld a, BANK(AICheckPlayerMaxHP)
rst FarCall rst FarCall
jr c, .asm_378f3 ; 378d1 $20 jr c, .asm_378f3 ; 378d1 $20
ld hl, $4c8e ld hl, $4c8e
@ -10132,19 +10100,13 @@ BattleCommand67: ; 379c9
call $1d6e call $1d6e
ld a, $f callba Function3d2f7
ld hl, $52f7
rst FarCall
ld a, $f callba Function3d380
ld hl, $5380
rst FarCall
call $3317 call $3317
ld a, $f callba Function3ed9f
ld hl, $6d9f
rst FarCall
call $1c17 call $1c17
call $300b call $300b
@ -10158,9 +10120,7 @@ BattleCommand67: ; 379c9
call $32f9 call $32f9
call Function0x37a67 call Function0x37a67
ld a, $f callba Function3d2e0
ld hl, $52e0
rst FarCall
jp c, EndMoveEffect jp c, EndMoveEffect
@ -10182,9 +10142,7 @@ BattleCommand67: ; 379c9
call Function0x37e01 call Function0x37e01
call Function0x37a82 call Function0x37a82
ld a, $f callba Function3d2e0
ld hl, $52e0
rst FarCall
jp c, EndMoveEffect jp c, EndMoveEffect
xor a xor a
@ -10484,9 +10442,7 @@ BattleCommand6a6c: ; 37b7e
call Function0x37e01 call Function0x37e01
call SwitchTurn call SwitchTurn
ld hl, $4cef callab Function3ccef
ld a, $f
rst FarCall ; callab 3ccef
call SwitchTurn call SwitchTurn
call UpdateUserInParty call UpdateUserInParty
@ -10552,21 +10508,15 @@ BattleCommand95: ; 37c1a
and a and a
jr nz, .asm_37c4f jr nz, .asm_37c4f
ld hl, $4c9f callab GetHalfMaxHP
ld a, $f
rst FarCall
ld hl, $4cde callab Function3ccde
ld a, $f
rst FarCall
jr nc, .asm_37c4f jr nc, .asm_37c4f
push bc push bc
call Function0x37e01 call Function0x37e01
pop bc pop bc
ld hl, $4c3f callab Function3cc3f
ld a, $f
rst FarCall
call UpdateUserInParty call UpdateUserInParty
ld a, $5 ld a, $5
@ -10642,9 +10592,7 @@ BattleCommand9a: ; 37c95
and a and a
ret z ret z
ld b, a ld b, a
ld hl, $45ec callab Function3c5ec
ld a, $f
rst FarCall
ld a, b ld a, b
cp $90 cp $90
ret z ret z
@ -10965,9 +10913,7 @@ Function0x37e47: ; 37e47
push hl push hl
push de push de
push bc push bc
ld hl, $40d6 callab Functioncc0d6
ld a, $33
rst FarCall ; callab SafePlayBattleAnimation
pop bc pop bc
pop de pop de
pop hl pop hl
@ -10988,9 +10934,7 @@ Function0x37e54: ; 37e54
push bc push bc
call SwitchTurn call SwitchTurn
ld hl, $40d6 callab Functioncc0d6
ld a, $33
rst FarCall ; callab SafePlayBattleAnimation
call SwitchTurn call SwitchTurn
pop bc pop bc

5
engine/fruit_trees.asm
View File

@ -58,10 +58,7 @@ CheckFruitTree: ; 44055
; 4405f ; 4405f
PickedFruitTree: ; 4405f PickedFruitTree: ; 4405f
ld a, $41 callba Function10609b ; empty function
ld hl, $609b
rst FarCall ; empty function
ld b, 1 ld b, 1
jp GetFruitTreeFlag jp GetFruitTreeFlag
; 4406a ; 4406a

24
home/copy.asm
View File

@ -106,44 +106,32 @@ Functiondfd: ; dfd
Functione4a: ; e4a Functione4a: ; e4a
ld a, $5 callba Function14135
ld hl, $4135
rst FarCall
ret ret
; e51 ; e51
Functione51: ; e51 Functione51: ; e51
ld a, $3e callba Functionfb449
ld hl, $7449
rst FarCall
ret ret
; e58 ; e58
Functione58: ; e58 Functione58: ; e58
ld a, $3e callba Functionfb4be
ld hl, $74be
rst FarCall
ret ret
; e5f ; e5f
Functione5f: ; e5f Functione5f: ; e5f
ld a, $3e callba Functionfb48a
ld hl, $748a callba Functionfb4b0
rst FarCall
ld a, $3e
ld hl, $74b0
rst FarCall
ret ret
; e6c ; e6c
Functione6c: ; e6c Functione6c: ; e6c
ld a, $3e callba Functionfb4b0
ld hl, $74b0
rst FarCall
ret ret
; e73 ; e73

32
home/map.asm
View File

@ -696,9 +696,7 @@ Function248a: ; 248a
call Function24ba call Function24ba
.asm_24b3 .asm_24b3
ld a, $41 callba Function10486d
ld hl, $486d
rst FarCall
ret ret
; 24ba ; 24ba
@ -1418,9 +1416,7 @@ Function2821: ; 2821
jr .asm_2875 jr .asm_2875
.asm_286f .asm_286f
ld a, $7 callba Function1c000
ld hl, $4000
rst FarCall
.asm_2875 .asm_2875
xor a xor a
@ -1944,9 +1940,7 @@ FadeToMenu: ; 2b29
xor a xor a
ld [hBGMapMode], a ld [hBGMapMode], a
call Function1d6e call Function1d6e
ld a, $23 callba Function8c084
ld hl, $4084
rst FarCall
call ClearSprites call ClearSprites
call Function2ed3 call Function2ed3
ret ret
@ -1973,13 +1967,9 @@ Function2b4d: ; 2b4d
Function2b5c: ; 2b5c Function2b5c: ; 2b5c
ld b, $9 ld b, $9
call GetSGBLayout call GetSGBLayout
ld a, $12 callba Function49409
ld hl, $5409
rst FarCall
call Function3200 call Function3200
ld a, $23 callba Function8c079
ld hl, $4079
rst FarCall
call Function2ee4 call Function2ee4
ret ret
; 2b74 ; 2b74
@ -2013,9 +2003,7 @@ Function2b74: ; 0x2b74
Function2bae: ; 2bae Function2bae: ; 2bae
call DisableLCD call DisableLCD
call ClearSprites call ClearSprites
ld a, $5 callba Function14168
ld hl, $4168
rst FarCall
call Functione51 call Functione51
call Functione5f call Functione5f
ld a, [hROMBank] ld a, [hROMBank]
@ -2025,9 +2013,7 @@ Function2bae: ; 2bae
ld a, [MapNumber] ld a, [MapNumber]
ld c, a ld c, a
call Function2c24 call Function2c24
ld a, $23 callba Function8c001
ld hl, $4001
rst FarCall
call Function2173 call Function2173
call Function2821 call Function2821
ld a, $9 ld a, $9
@ -2278,9 +2264,7 @@ Function2cbd: ; 2cbd
jr z, .asm_2cee jr z, .asm_2cee
bit 7, c bit 7, c
jr nz, .asm_2cda jr nz, .asm_2cda
ld a, $22 callba Function8b342
ld hl, $7342
rst FarCall
ld e, c ld e, c
ld d, $0 ld d, $0
.asm_2cd7 .asm_2cd7

4
home/map_objects.asm
View File

@ -337,9 +337,7 @@ Function1956: ; 1956
call Function271e call Function271e
ld a, [hConnectionStripLength] ld a, [hConnectionStripLength]
call GetMapObject call GetMapObject
ld a, $2 callba Function80e7
ld hl, $40e7
rst FarCall
ret ret
; 1967 ; 1967

12
home/menu.asm
View File

@ -561,9 +561,7 @@ Function201c: ; 201c
Function202a: ; 202a Function202a: ; 202a
ld a, [hROMBank] ld a, [hROMBank]
ld [$cf94], a ld [$cf94], a
ld a, $9 callba Function2400e
ld hl, $400e
rst FarCall
ld a, [$cf88] ld a, [$cf88]
ret ret
; 2039 ; 2039
@ -571,9 +569,7 @@ Function202a: ; 202a
Function2039: ; 2039 Function2039: ; 2039
ld a, [hROMBank] ld a, [hROMBank]
ld [$cf94], a ld [$cf94], a
ld a, $9 callba Function24022
ld hl, $4022
rst FarCall
ld a, [$cf88] ld a, [$cf88]
ret ret
; 2048 ; 2048
@ -581,9 +577,7 @@ Function2039: ; 2039
Function2048: ; 2048 Function2048: ; 2048
ld a, [hROMBank] ld a, [hROMBank]
ld [$cf94], a ld [$cf94], a
ld a, $9 callba Function2403c
ld hl, $403c
rst FarCall
ld a, [$cf88] ld a, [$cf88]
ret ret
; 2057 ; 2057

8
home/text.asm
View File

@ -315,9 +315,7 @@ CheckDict: ; 1087
Function117b: ; 117b Function117b: ; 117b
ld c, l ld c, l
ld b, h ld b, h
ld a, $5f callba Function17f036
ld hl, $7036
rst FarCall
jp PlaceNextChar jp PlaceNextChar
; 1186 ; 1186
@ -463,9 +461,7 @@ Function1205: ; 1205
ld de, String12a2 ld de, String12a2
call PlaceString call PlaceString
push bc push bc
ld hl, $5939 callab Function39939
ld a, $e
rst FarCall
pop hl pop hl
ld de, StringBuffer1 ld de, StringBuffer1
jr .asm_126a ; 0x1246 $22 jr .asm_126a ; 0x1246 $22

4
home/time.asm
View File

@ -204,9 +204,7 @@ Function658: ; 658
jr Function677 jr Function677
Function677 Function677
ld a, $5 callba Function140ed
ld hl, $40ed
rst FarCall
ret ret
; 67e ; 67e

4
items/item_descriptions.asm
View File

@ -4,9 +4,7 @@ GetItemDescription: ; 0x1c8955
jr c, .nomovedesc ; if not a TM, use a predefined string jr c, .nomovedesc ; if not a TM, use a predefined string
ld [$d106], a ld [$d106], a
push de push de
ld a, $b ; XXX replace this with BANK(label) callba Function2c7b6
ld hl, $47b6 ; XXX replace this with label
rst FarCall
pop hl pop hl
ld a, [$d265] ld a, [$d265]
ld [$cf60], a ld [$cf60], a

116
items/item_effects.asm
View File

@ -150,9 +150,7 @@ ParkBall: ; e8a2
ld d, a ld d, a
push de push de
ld a, [BattleMonItem] ld a, [BattleMonItem]
ld a, $d callba GetItem
ld hl, $7dd0
rst FarCall
ld a, b ld a, b
cp $46 cp $46
@ -258,9 +256,7 @@ ParkBall: ; e8a2
ld [CurPartySpecies], a ld [CurPartySpecies], a
ld a, [EnemyMonLevel] ld a, [EnemyMonLevel]
ld [CurPartyLevel], a ld [CurPartyLevel], a
ld a, $f callba LoadEnemyMon
ld hl, $68eb
rst FarCall
pop af pop af
ld [EnemySubStatus5], a ld [EnemySubStatus5], a
@ -296,9 +292,7 @@ ParkBall: ; e8a2
ld a, [BattleType] ld a, [BattleType]
cp $3 cp $3
jp z, $6bd9 jp z, $6bd9
ld a, $41 callba Function10607f
ld hl, $607f
rst FarCall
ld hl, $6dc9 ld hl, $6dc9
call $1057 call $1057
@ -351,9 +345,7 @@ ParkBall: ; e8a2
ld a, $6 ld a, $6
call Predef call Predef
ld a, $13 callba Function4db49
ld hl, $5b49
rst FarCall
ld a, [CurItem] ld a, [CurItem]
cp $a4 cp $a4
@ -392,9 +384,7 @@ ParkBall: ; e8a2
xor a xor a
ld [MonType], a ld [MonType], a
ld b, $0 ld b, $0
ld a, $4 callba Function116c1
ld hl, $56c1
rst FarCall
call $04b6 call $04b6
@ -412,9 +402,7 @@ ParkBall: ; e8a2
ld a, $9 ld a, $9
call Predef call Predef
ld a, $13 callba Function4db83
ld hl, $5b83
rst FarCall
ld a, $1 ld a, $1
call GetSRAMBank call GetSRAMBank
@ -452,9 +440,7 @@ ParkBall: ; e8a2
ld [MonType], a ld [MonType], a
ld de, $d050 ld de, $d050
ld b, $0 ld b, $0
ld a, $4 callba Function116c1
ld hl, $56c1
rst FarCall
ld a, $1 ld a, $1
call GetSRAMBank call GetSRAMBank
@ -490,9 +476,7 @@ ParkBall: ; e8a2
jr .asm_ebe2 jr .asm_ebe2
ld a, $3 callba Functione6ce
ld hl, $66ce
rst FarCall
jr .asm_ebe2 jr .asm_ebe2
@ -762,9 +746,7 @@ Function_0xed12: ; ed12
ld [MonType], a ld [MonType], a
ld a, [CurBattleMon] ld a, [CurBattleMon]
ld [CurPartyMon], a ld [CurPartyMon], a
ld a, $14 callba GetGender
ld hl, $4bdd
rst FarCall
jr c, .asm_ed66 jr c, .asm_ed66
ld d, 0 ld d, 0
@ -777,9 +759,7 @@ Function_0xed12: ; ed12
ld [CurPartySpecies], a ld [CurPartySpecies], a
ld a, WILDMON ld a, WILDMON
ld [MonType], a ld [MonType], a
ld a, $14 callba GetGender
ld hl, $4bdd
rst FarCall
jr c, .asm_ed65 jr c, .asm_ed65
ld d, 0 ld d, 0
@ -875,17 +855,13 @@ INCBIN "baserom.gbc", $edab, $ee01 - $edab
Item06: ; ee01 Item06: ; ee01
ld a, $24 callba Function91ae1
ld hl, $5ae1
rst FarCall
ret ret
; ee08 ; ee08
Bicycle: ; ee08 Bicycle: ; ee08
ld a, $3 callba Functiond0b3
ld hl, $50b3
rst FarCall
ret ret
; ee0f ; ee0f
@ -909,9 +885,7 @@ SunStone: ; ee0f
jr z, .asm_ee35 jr z, .asm_ee35
ld a, $1 ld a, $1
ld [$d1e9], a ld [$d1e9], a
ld a, $10 callba Function421d8
ld hl, $61d8
rst FarCall
ld a, [$d268] ld a, [$d268]
and a and a
@ -969,9 +943,7 @@ Calcium: ; ee3d
call $1057 call $1057
ld c, $2 ld c, $2
ld a, $1 callba ChangeHappiness
ld hl, $71c2
rst FarCall
jp $7795 jp $7795
@ -1005,9 +977,7 @@ RareCandy: ; ef14
ld [CurPartyLevel], a ld [CurPartyLevel], a
push de push de
ld d, a ld d, a
ld a, $14 callba Function50e47
ld hl, $4e47
rst FarCall
pop de pop de
ld a, $8 ld a, $8
@ -1045,9 +1015,7 @@ RareCandy: ; ef14
ld a, [hl] ld a, [hl]
adc b adc b
ld [hl], a ld [hl], a
ld a, $9 callba Function2709e
ld hl, $709e
rst FarCall
ld a, $f8 ld a, $f8
call $724a call $724a
@ -1078,9 +1046,7 @@ RareCandy: ; ef14
xor a xor a
ld [$d1e9], a ld [$d1e9], a
ld a, $10 callba Function421d8
ld hl, $61d8
rst FarCall
jp $7795 jp $7795
; efad ; efad
@ -1097,9 +1063,7 @@ HealPowder: ; efad
cp $0 cp $0
jr nz, .asm_efc9 jr nz, .asm_efc9
ld c, $f ld c, $f
ld a, $1 callba ChangeHappiness
ld hl, $71c2
rst FarCall
call $77d6 call $77d6
@ -1260,9 +1224,7 @@ RevivalHerb: ; f0a9
cp $0 cp $0
jr nz, .asm_f0c5 jr nz, .asm_f0c5
ld c, $11 ld c, $11
ld a, $1 callba ChangeHappiness
ld hl, $71c2
rst FarCall
call $77d6 call $77d6
@ -1367,9 +1329,7 @@ Function_0xf192: ; f192
pop bc pop bc
cp $0 cp $0
jr nz, .asm_f1a6 jr nz, .asm_f1a6
ld a, $1 callba ChangeHappiness
ld hl, $71c2
rst FarCall
call $77d6 call $77d6
@ -1803,9 +1763,7 @@ INCBIN "baserom.gbc",$f44a,$f44f - $f44a
EscapeRope: ; f44f EscapeRope: ; f44f
xor a xor a
ld [$d0ec], a ld [$d0ec], a
ld a, $3 callba Functioncb95
ld hl, $4b95
rst FarCall
ld a, [$d0ec] ld a, [$d0ec]
cp $1 cp $1
@ -1911,26 +1869,18 @@ XSpecial: ; f4c5
ld [hBattleTurn], a ld [hBattleTurn], a
ld [AttackMissed], a ld [AttackMissed], a
ld [$c70d], a ld [$c70d], a
ld a, $d callba Function0x361ef
ld hl, $61ef
rst FarCall
call WaitSFX call WaitSFX
ld a, $d callba BattleCommand8c
ld hl, $63b8
rst FarCall
ld a, $d callba BattleCommand8e
ld hl, $644c
rst FarCall
ld a, [CurBattleMon] ld a, [CurBattleMon]
ld [CurPartyMon], a ld [CurPartyMon], a
ld c, $3 ld c, $3
ld a, $1 callba ChangeHappiness
ld hl, $71c2
rst FarCall
ret ret
; f504 ; f504
@ -2072,17 +2022,13 @@ SuperRod: ; f5ad
; f5b1 ; f5b1
Function_0xf5b1: ; f5b1 Function_0xf5b1: ; f5b1
ld a, $3 callba Functioncf8e
ld hl, $4f8e
rst FarCall
ret ret
; f5b8 ; f5b8
Itemfinder: ; f5b8 Itemfinder: ; f5b8
ld a, $4 callba Function12580
ld hl, $6580
rst FarCall
ret ret
; f5bf ; f5bf
@ -2123,9 +2069,7 @@ Mysteryberry: ; f5bf
ld [CurMoveNum], a ld [CurMoveNum], a
ld a, $2 ld a, $2
ld [$d235], a ld [$d235], a
ld a, $f callba Function3e4bc
ld hl, $64bc
rst FarCall
pop bc pop bc
ld a, b ld a, b
@ -2221,9 +2165,7 @@ GorgeousBox: ; f767
; f769 ; f769
Function_0xf769: ; f769 Function_0xf769: ; f769
ld a, $9 callba Function26f02
ld hl, $6f02
rst FarCall
ld hl, UnknownText_0xf778 ld hl, UnknownText_0xf778
call $1057 call $1057

26
main.asm
View File

@ -113339,6 +113339,7 @@ Function106095: ; 106095
jp Function10611d jp Function10611d
; 10609b ; 10609b
Function10609b: ; 10609b
ret ret
; 10609c (41:609c) ; 10609c (41:609c)
@ -113409,7 +113410,13 @@ Function1060df: ; 1060df
ret ret
; 1060e0 ; 1060e0
INCBIN "baserom.gbc",$1060e0,$1060fb - $1060e0 INCBIN "baserom.gbc",$1060e0,$1060e5 - $1060e0
Function1060e5: ; 1060e5
ret
; 1060e6 (41:60e6)
INCBIN "baserom.gbc",$1060e6,$1060fb - $1060e6
Function1060fb: ; 1060fb Function1060fb: ; 1060fb
@ -122952,7 +122959,22 @@ INCLUDE "text/phone/extra3.asm"
SECTION "bank5E",ROMX,BANK[$5E] SECTION "bank5E",ROMX,BANK[$5E]
INCBIN "baserom.gbc",$178000,$17801f - $178000 Function178000:
ld a, BANK(DrawPlayerHUD)
ld hl, DrawPlayerHUD
rst $8 ; ; indirect jump to DrawPlayerHUD (3df58 (f:5f58))
ld hl, PlayerHPPal ; $cd99
call SetHPPal
ld a, BANK(Function3e043)
ld hl, Function3e043
rst $8 ; ; indirect jump to Function3e043 (3e043 (f:6043))
ld hl, EnemyHPPal ; $cd9a
call SetHPPal
ld a, BANK(Function3ee27)
ld hl, Function3ee27
rst $8 ; ; indirect jump to Function3ee27 (3ee27 (f:6e27))
ret
; 17801f (5e:401f)
; Songs V ; Songs V

4
predef/cgb.asm
View File

@ -158,9 +158,7 @@ Function8e23: ; 8e23
Function8e85: ; 8e85 Function8e85: ; 8e85
ld a, $40 callba Function100dc0
ld hl, $4dc0
rst FarCall
Function8e8b: ; 8e8b Function8e8b: ; 8e8b
ld hl, $7311 ld hl, $7311