thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-12-25 03:46:49 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use macros to define predefs.

Browse source
This commit is contained in:
yenatch 2014-06-16 13:25:46 -07:00
parent 94dc695543
commit d10108a066
10 changed files with 123 additions and 113 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
engine/battle/4.asm
View file

@ -15,7 +15,7 @@ Func_128ea: ; 128ea (4:68ea)
inc b inc b
ret ret
Func_128ef: ; 128ef (4:68ef) DrawHP: ; 128ef (4:68ef)
call GetPredefRegisters call GetPredefRegisters
ld a, $1 ld a, $1
jr asm_128fb jr asm_128fb

2
engine/battle/core.asm
View file

@ -6661,7 +6661,7 @@ Func_3eed3: ; 3eed3 (f:6ed3)
PlayMoveAnimation: ; 3ef07 (f:6f07) PlayMoveAnimation: ; 3ef07 (f:6f07)
ld [W_ANIMATIONID],a ld [W_ANIMATIONID],a
call Delay3 call Delay3
PREDEF_JUMP MoveAnimationPredef ; predef 8 predef_jump MoveAnimation
InitBattle: ; 3ef12 (f:6f12) InitBattle: ; 3ef12 (f:6f12)
ld a, [W_CUROPPONENT] ; wd059 ld a, [W_CUROPPONENT] ; wd059

1
engine/hp_bar.asm
View file

@ -46,6 +46,7 @@ GetHPBarLength: ; f9df (3:79df)
; predef $48 ; predef $48
UpdateHPBar: ; fa1d (3:7a1d) UpdateHPBar: ; fa1d (3:7a1d)
UpdateHPBar2:
push hl push hl
ld hl, wHPBarOldHP ld hl, wHPBarOldHP
ld a, [hli] ld a, [hli]

2
engine/menu/status_screen.asm
View file

@ -59,7 +59,7 @@ StatusScreen: ; 12953 (4:6953)
call PlaceString ; "TYPE1/" call PlaceString ; "TYPE1/"
FuncCoord 11,3 FuncCoord 11,3
ld hl, Coord ld hl, Coord
PREDEF DrawHPBarPredef ; predef $5f predef DrawHP ; predef $5f
ld hl, wcf25 ld hl, wcf25
call GetHealthBarColor call GetHealthBarColor
ld b, $3 ld b, $3

2
engine/overworld/pokecenter.asm
View file

@ -21,7 +21,7 @@ DisplayPokemonCenterDialogue_: ; 6fe6 (1:6fe6)
ld a, $18 ld a, $18
ld [wSpriteStateData1 + $12], a ; make the nurse turn to face the machine ld [wSpriteStateData1 + $12], a ; make the nurse turn to face the machine
call Delay3 call Delay3
PREDEF HealPartyPredef predef HealParty
callba AnimateHealingMachine ; do the healing machine animation callba AnimateHealingMachine ; do the healing machine animation
xor a xor a
ld [wMusicHeaderPointer], a ld [wMusicHeaderPointer], a

193
engine/predefs.asm
View file

@ -52,105 +52,102 @@ GetPredefPointer:
PredefPointers: ; 4fe79 (13:7e79) PredefPointers: ; 4fe79 (13:7e79)
; these are pointers to ASM routines. ; these are pointers to ASM routines.
; they appear to be used in overworld map scripts. ; they appear to be used in overworld map scripts.
dbw BANK(Func_3cd60),Func_3cd60 add_predef Func_3cd60
dbw BANK(Func_3f0c6),Func_3f0c6 add_predef Func_3f0c6
dbw BANK(Func_3f073),Func_3f073 add_predef Func_3f073
dbw BANK(ScaleSpriteByTwo), ScaleSpriteByTwo add_predef ScaleSpriteByTwo
dbw BANK(LoadMonBackPic), LoadMonBackPic add_predef LoadMonBackPic
dbw BANK(Func_79aba),Func_79aba add_predef Func_79aba
dbw BANK(Func_f132),Func_f132 add_predef Func_f132
HealPartyPredef: ; 4fe8e (13:7e8e) add_predef HealParty
dbw BANK(HealParty),HealParty add_predef MoveAnimation; 08 play move animation
MoveAnimationPredef: ; 4fe91 (13:7e91) add_predef DivideBCDPredef
dbw BANK(MoveAnimation),MoveAnimation; 08 play move animation add_predef DivideBCDPredef2
dbw BANK(DivideBCDPredef),DivideBCDPredef add_predef AddBCDPredef
dbw BANK(DivideBCDPredef),DivideBCDPredef add_predef SubBCDPredef
dbw BANK(AddBCDPredef), AddBCDPredef add_predef DivideBCDPredef3
dbw BANK(SubBCDPredef), SubBCDPredef add_predef DivideBCDPredef4
dbw BANK(DivideBCDPredef),DivideBCDPredef add_predef InitPlayerData
dbw BANK(DivideBCDPredef),DivideBCDPredef add_predef FlagActionPredef
dbw BANK(InitPlayerData), InitPlayerData add_predef HideObject
dbw BANK(FlagActionPredef),FlagActionPredef add_predef IsObjectHidden
dbw BANK(HideObject), HideObject add_predef Func_c69c
dbw BANK(IsObjectHidden), IsObjectHidden add_predef AnyPartyAlive
dbw BANK(Func_c69c),Func_c69c add_predef ShowObject
dbw BANK(AnyPartyAlive), AnyPartyAlive add_predef ShowObject2
dbw BANK(ShowObject), ShowObject add_predef Func_ee9e
dbw BANK(ShowObject), ShowObject add_predef InitPlayerData2
dbw BANK(Func_ee9e),Func_ee9e add_predef Func_c754
dbw BANK(InitPlayerData), InitPlayerData add_predef Func_3af5b
dbw BANK(Func_c754),Func_c754 add_predef LearnMove
dbw BANK(Func_3af5b),Func_3af5b add_predef IsItemInBag_ ; 1C, used in Pokémon Tower
dbw BANK(LearnMove),LearnMove
dbw BANK(IsItemInBag_),IsItemInBag_ ; 1C, used in Pokémon Tower
dbw $03,Func_3eb5 ; for these two, the bank number is actually 0 dbw $03,Func_3eb5 ; for these two, the bank number is actually 0
dbw $03,GiveItem dbw $03,GiveItem
dbw BANK(Func_480eb),Func_480eb add_predef Func_480eb
dbw BANK(Func_f8ba),Func_f8ba add_predef Func_f8ba
dbw BANK(Func_480ff),Func_480ff add_predef Func_480ff
dbw BANK(Func_f929),Func_f929 add_predef Func_f929
dbw BANK(Func_f9a0),Func_f9a0 add_predef Func_f9a0
dbw BANK(Func_48125),Func_48125 add_predef Func_48125
dbw BANK(UpdateHPBar),UpdateHPBar add_predef UpdateHPBar
dbw BANK(HPBarLength), HPBarLength add_predef HPBarLength
dbw BANK(Func_5ab0),Func_5ab0 add_predef Func_5ab0
dbw BANK(Func_3ed02),Func_3ed02 add_predef Func_3ed02
dbw BANK(ShowPokedexMenu), ShowPokedexMenu add_predef ShowPokedexMenu
dbw BANK(Func_3ad1c),Func_3ad1c add_predef Func_3ad1c
dbw BANK(SaveSAVtoSRAM0),SaveSAVtoSRAM0 add_predef SaveSAVtoSRAM0
dbw BANK(InitOpponent),InitOpponent add_predef InitOpponent
dbw BANK(Func_5a5f),Func_5a5f add_predef Func_5a5f
dbw BANK(DrawBadges), DrawBadges add_predef DrawBadges
dbw BANK(Func_410f3),Func_410f3 add_predef Func_410f3
dbw BANK(BattleTransition),BattleTransition add_predef BattleTransition
dbw BANK(Func_79dda),Func_79dda add_predef Func_79dda
dbw BANK(PlayIntro),PlayIntro add_predef PlayIntro
dbw BANK(Func_79869),Func_79869 add_predef Func_79869
dbw BANK(FlashScreen), FlashScreen add_predef FlashScreen
dbw BANK(Func_c586),Func_c586 add_predef Func_c586
dbw BANK(StatusScreen),StatusScreen ; 37 0x12953 add_predef StatusScreen
dbw BANK(StatusScreen2),StatusScreen2 ; 38 add_predef StatusScreen2
dbw BANK(Func_410e2),Func_410e2 add_predef Func_410e2
dbw BANK(TrainerEngage), TrainerEngage add_predef TrainerEngage
dbw BANK(IndexToPokedex),IndexToPokedex add_predef IndexToPokedex
dbw BANK(Predef3B),Predef3B; 3B display pic? add_predef Predef3B; 3B display pic?
dbw BANK(UsedCut),UsedCut add_predef UsedCut
dbw BANK(ShowPokedexData),ShowPokedexData add_predef ShowPokedexData
dbw BANK(WriteMonMoves),WriteMonMoves add_predef WriteMonMoves
dbw BANK(SaveSAV),SaveSAV add_predef SaveSAV
dbw BANK(LoadSGB), LoadSGB add_predef LoadSGB
dbw BANK(Func_f113),Func_f113 add_predef Func_f113
dbw BANK(SetPartyMonTypes),SetPartyMonTypes add_predef SetPartyMonTypes
dbw BANK(CanLearnTM), CanLearnTM add_predef CanLearnTM
dbw BANK(TMToMove),TMToMove add_predef TMToMove
dbw BANK(Func_71ddf),Func_71ddf add_predef Func_71ddf
dbw BANK(StarterDex), StarterDex ; 46 add_predef StarterDex ; 46
dbw BANK(_AddPartyMon), _AddPartyMon add_predef _AddPartyMon
dbw BANK(UpdateHPBar),UpdateHPBar add_predef UpdateHPBar2
dbw BANK(Func_3cdec),Func_3cdec add_predef Func_3cdec
dbw BANK(LoadTownMap_Nest),LoadTownMap_Nest add_predef LoadTownMap_Nest
dbw BANK(Func_27d6b),Func_27d6b add_predef Func_27d6b
dbw BANK(EmotionBubble), EmotionBubble; 4C player exclamation add_predef EmotionBubble; 4C player exclamation
dbw BANK(Func_5aaf),Func_5aaf; return immediately add_predef Func_5aaf; return immediately
dbw BANK(AskName), AskName add_predef AskName
dbw BANK(PewterGuys),PewterGuys add_predef PewterGuys
dbw BANK(SaveSAVtoSRAM2),SaveSAVtoSRAM2 add_predef SaveSAVtoSRAM2
dbw BANK(LoadSAVCheckSum2),LoadSAVCheckSum2 add_predef LoadSAVCheckSum2
dbw BANK(LoadSAV),LoadSAV add_predef LoadSAV
dbw BANK(SaveSAVtoSRAM1),SaveSAVtoSRAM1 add_predef SaveSAVtoSRAM1
dbw BANK(Predef54),Predef54 ; 54 initiate trade add_predef Predef54 ; 54 initiate trade
dbw BANK(HallOfFamePC), HallOfFamePC add_predef HallOfFamePC
dbw BANK(DisplayDexRating),DisplayDexRating add_predef DisplayDexRating
dbw $1E, _LeaveMapAnim ; wrong bank dbw $1E, _LeaveMapAnim ; wrong bank
dbw $1E, Func_70510 ; wrong bank dbw $1E, Func_70510 ; wrong bank
dbw BANK(Func_c5be),Func_c5be add_predef Func_c5be
dbw BANK(Func_c60b),Func_c60b add_predef Func_c60b
dbw BANK(PrintStrengthTxt), PrintStrengthTxt add_predef PrintStrengthTxt
dbw BANK(PickupItem),PickupItem add_predef PickupItem
dbw BANK(Func_27d98),Func_27d98 add_predef Func_27d98
dbw BANK(LoadMovePPs),LoadMovePPs add_predef LoadMovePPs
DrawHPBarPredef: ; 4ff96 (13:7f96) add_predef DrawHP ; 5F
dbw BANK(Func_128ef),Func_128ef ; 5F draw HP bar add_predef Func_128f6
dbw BANK(Func_128f6),Func_128f6 add_predef Func_1c9c6
dbw BANK(Func_1c9c6),Func_1c9c6 add_predef OaksAideScript
dbw BANK(OaksAideScript),OaksAideScript

6
home/init.asm
View file

@ -95,8 +95,7 @@ rLCDC_DEFAULT EQU %11100011
ei ei
ld a, $40 ; PREDEF_SGB_BORDER predef LoadSGB
call Predef
ld a, BANK(SFX_1f_67) ld a, BANK(SFX_1f_67)
ld [wc0ef], a ld [wc0ef], a
@ -108,8 +107,7 @@ rLCDC_DEFAULT EQU %11100011
dec a dec a
ld [wcfcb], a ld [wcfcb], a
ld a, $32 ; PREDEF_INTRO predef PlayIntro
call Predef
call DisableLCD call DisableLCD
call ClearVram call ClearVram

18
macros.asm
View file

@ -138,13 +138,23 @@ TX_BCD: MACRO
ENDM ENDM
; Predef macro. ; Predef macro.
PREDEF: MACRO add_predef: MACRO
ld a, (\1 - PredefPointers) / 3 \1Predef::
db BANK(\1)
dw \1
ENDM
predef_id: MACRO
ld a, (\1Predef - PredefPointers) / 3
ENDM
predef: MACRO
predef_id \1
call Predef call Predef
ENDM ENDM
PREDEF_JUMP: MACRO predef_jump: MACRO
ld a, (\1 - PredefPointers) / 3 predef_id \1
jp Predef jp Predef
ENDM ENDM

8
main.asm
View file

@ -494,8 +494,7 @@ TestBattle:
ld a, RHYDON ld a, RHYDON
ld [W_CUROPPONENT], a ld [W_CUROPPONENT], a
ld a, $2c ; PREDEF_BATTLE predef InitOpponent
call Predef
; When the battle ends, ; When the battle ends,
; do it all again. ; do it all again.
@ -3259,6 +3258,7 @@ IsObjectHidden: ; f1a6 (3:71a6)
; adds missable object (items, leg. pokemon, etc.) to the map ; adds missable object (items, leg. pokemon, etc.) to the map
; [wcc4d]: index of the missable object to be added (global index) ; [wcc4d]: index of the missable object to be added (global index)
ShowObject: ; f1c8 (3:71c8) ShowObject: ; f1c8 (3:71c8)
ShowObject2:
ld hl, W_MISSABLEOBJECTFLAGS ld hl, W_MISSABLEOBJECTFLAGS
ld a, [wcc4d] ld a, [wcc4d]
ld c, a ld c, a
@ -4136,6 +4136,9 @@ HealParty:
DivideBCDPredef:: DivideBCDPredef::
DivideBCDPredef2::
DivideBCDPredef3::
DivideBCDPredef4::
call GetPredefRegisters call GetPredefRegisters
DivideBCD:: DivideBCD::
@ -4347,6 +4350,7 @@ SubBCD::
InitPlayerData: InitPlayerData:
InitPlayerData2:
call Random call Random
ld a, [hRandomSub] ld a, [hRandomSub]

2
scripts/redshouse1f.asm
View file

@ -27,7 +27,7 @@ MomHealPokemon: ; 4818a (12:418a)
call PrintText call PrintText
call GBFadeOut2 call GBFadeOut2
call ReloadMapData call ReloadMapData
PREDEF HealPartyPredef predef HealParty
ld a, MUSIC_PKMN_HEALED ld a, MUSIC_PKMN_HEALED
ld [wc0ee], a ld [wc0ee], a
call PlaySound ; play sound? call PlaySound ; play sound?