From 6d8c6055b5d5910d4da6997199f0984f8cd9149f Mon Sep 17 00:00:00 2001 From: yenatch Date: Sat, 31 May 2014 01:22:15 -0700 Subject: Split more code out of home.asm. --- home/init.asm | 139 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 139 insertions(+) create mode 100644 home/init.asm (limited to 'home/init.asm') diff --git a/home/init.asm b/home/init.asm new file mode 100644 index 00000000..939e81b5 --- /dev/null +++ b/home/init.asm @@ -0,0 +1,139 @@ +SoftReset:: + call StopAllSounds + call GBPalWhiteOut + ld c, $20 + call DelayFrames + ; fallthrough + +Init:: +; Program init. + +rLCDC_DEFAULT EQU %11100011 +; * LCD enabled +; * Window tile map at $9C00 +; * Window display enabled +; * BG and window tile data at $8800 +; * BG tile map at $9800 +; * 8x8 OBJ size +; * OBJ display enabled +; * BG display enabled + + di + + xor a + ld [rIF], a + ld [rIE], a + ld [$ff43], a + ld [$ff42], a + ld [$ff01], a + ld [$ff02], a + ld [$ff4b], a + ld [$ff4a], a + ld [$ff06], a + ld [$ff07], a + ld [$ff47], a + ld [$ff48], a + ld [$ff49], a + + ld a, rLCDC_ENABLE_MASK + ld [rLCDC], a + call DisableLCD + + ld sp, wStack + + ld hl, $c000 ; start of WRAM + ld bc, $2000 ; size of WRAM +.loop + ld [hl], 0 + inc hl + dec bc + ld a, b + or c + jr nz, .loop + + call ClearVram + + ld hl, $ff80 + ld bc, $ffff - $ff80 + call FillMemory + + call ClearSprites + + ld a, Bank(WriteDMACodeToHRAM) + ld [H_LOADEDROMBANK], a + ld [MBC3RomBank], a + call WriteDMACodeToHRAM + + xor a + ld [$ffd7], a + ld [$ff41], a + ld [$ffae], a + ld [$ffaf], a + ld [$ff0f], a + ld a, 1 << VBLANK + 1 << TIMER + 1 << SERIAL + ld [rIE], a + + ld a, 144 ; move the window off-screen + ld [$ffb0], a + ld [rWY], a + ld a, 7 + ld [rWX], a + + ld a, $ff + ld [$ffaa], a + + ld h, vBGMap0 / $100 + call ClearBgMap + ld h, vBGMap1 / $100 + call ClearBgMap + + ld a, rLCDC_DEFAULT + ld [rLCDC], a + ld a, 16 + ld [hSoftReset], a + call StopAllSounds + + ei + + ld a, $40 ; PREDEF_SGB_BORDER + call Predef + + ld a, $1f + ld [wc0ef], a + ld [wc0f0], a + ld a, $9c + ld [$ffbd], a + xor a + ld [$ffbc], a + dec a + ld [wcfcb], a + + ld a, $32 ; PREDEF_INTRO + call Predef + + call DisableLCD + call ClearVram + call GBPalNormal + call ClearSprites + ld a, rLCDC_DEFAULT + ld [rLCDC], a + + jp SetDefaultNamesBeforeTitlescreen + +ClearVram: + ld hl, $8000 + ld bc, $2000 + xor a + jp FillMemory + + +StopAllSounds:: + ld a, Bank(Func_9876) + ld [wc0ef], a + ld [wc0f0], a + xor a + ld [wMusicHeaderPointer], a + ld [wc0ee], a + ld [wcfca], a + dec a + jp PlaySound -- cgit v1.3.1-sl0p From fadac928bccb9be1010e73df3253021312f5a2fb Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Mon, 9 Jun 2014 16:18:29 -0400 Subject: Clean up music bank references --- audio/engine_1.asm | 2 +- audio/engine_2.asm | 2 +- audio/engine_3.asm | 2 +- engine/intro.asm | 2 +- engine/overworld/healing_machine.asm | 2 +- engine/overworld/npc_movement.asm | 4 ++-- engine/titlescreen.asm | 2 +- home/audio.asm | 16 ++++++++-------- home/init.asm | 2 +- home/vblank.asm | 10 +++++----- 10 files changed, 22 insertions(+), 22 deletions(-) (limited to 'home/init.asm') diff --git a/audio/engine_1.asm b/audio/engine_1.asm index c1c4999b..4177e14d 100644 --- a/audio/engine_1.asm +++ b/audio/engine_1.asm @@ -1,6 +1,6 @@ ; The first of three duplicated sound engines. -Func_9103:: ; 0x9103 +Music2_UpdateMusic:: ; 0x9103 ld c, CH0 .loop ld b, $0 diff --git a/audio/engine_2.asm b/audio/engine_2.asm index b5a07c0f..037c8741 100644 --- a/audio/engine_2.asm +++ b/audio/engine_2.asm @@ -1,6 +1,6 @@ ; The second of three duplicated sound engines. -Func_21879:: ; 21879 (8:5879) +Music8_UpdateMusic:: ; 21879 (8:5879) ld c, CH0 .loop ld b, $0 diff --git a/audio/engine_3.asm b/audio/engine_3.asm index 45f890df..fabdecef 100644 --- a/audio/engine_3.asm +++ b/audio/engine_3.asm @@ -1,6 +1,6 @@ ; The third of three duplicated sound engines. -Func_7d177:: ; 7d177 (1f:5177) +Music1f_UpdateMusic:: ; 7d177 (1f:5177) ld c, CH0 .loop ld b, $0 diff --git a/engine/intro.asm b/engine/intro.asm index 8e344e48..00907065 100755 --- a/engine/intro.asm +++ b/engine/intro.asm @@ -322,7 +322,7 @@ PlayShootingStar: ; 4188a (10:588a) ld c, $28 call DelayFrames .asm_418d0 - ld a, Bank(Func_7d8ea) + ld a, BANK(Music_IntroBattle) ld [wc0ef], a ld [wc0f0], a ld a, MUSIC_INTRO_BATTLE diff --git a/engine/overworld/healing_machine.asm b/engine/overworld/healing_machine.asm index f9636fcb..a30a5dff 100755 --- a/engine/overworld/healing_machine.asm +++ b/engine/overworld/healing_machine.asm @@ -41,7 +41,7 @@ AnimateHealingMachine: ; 70433 (1c:4433) ld a, $ff ld [wc0ee], a call PlaySound - ld a, Bank(Func_9876) + ld a, BANK(Music_PkmnHealed) ld [wc0ef], a .asm_70495 ld a, MUSIC_PKMN_HEALED diff --git a/engine/overworld/npc_movement.asm b/engine/overworld/npc_movement.asm index 234b7645..260dafd9 100755 --- a/engine/overworld/npc_movement.asm +++ b/engine/overworld/npc_movement.asm @@ -158,7 +158,7 @@ PointerTable_1a510: ; 1a510 (6:6510) dw Func_1a56b Func_1a514: ; 1a514 (6:6514) - ld a, Bank(Func_9876) + ld a, BANK(Music_MuseumGuy) ld [wc0ef], a ld [wc0f0], a ld a, MUSIC_MUSEUM_GUY @@ -215,7 +215,7 @@ PointerTable_1a57d: ; 1a57d (6:657d) dw Func_1a56b Func_1a581: ; 1a581 (6:6581) - ld a, Bank(Func_9876) + ld a, BANK(Music_MuseumGuy) ld [wc0ef], a ld [wc0f0], a ld a, MUSIC_MUSEUM_GUY diff --git a/engine/titlescreen.asm b/engine/titlescreen.asm index 10081d63..e281af31 100755 --- a/engine/titlescreen.asm +++ b/engine/titlescreen.asm @@ -17,7 +17,7 @@ SetDefaultNamesBeforeTitlescreen: ; 42b7 (1:42b7) ld [hli], a ld [hli], a ld [hl], a - ld a, Bank(Func_7d8ea) + ld a, BANK(Music_TitleScreen) ld [wc0ef], a ld [wc0f0], a diff --git a/home/audio.asm b/home/audio.asm index 724b8c5f..fa62cc8a 100644 --- a/home/audio.asm +++ b/home/audio.asm @@ -30,7 +30,7 @@ asm_2324:: ; 2324 (0:2324) ld b, a ld a, d and a - ld a, Bank(Func_7d8ea) + ld a, BANK(Music_BikeRiding) jr nz, .asm_233e ld [wc0ef], a .asm_233e @@ -56,19 +56,19 @@ asm_2324:: ; 2324 (0:2324) Func_235f:: ; 235f (0:235f) ld a, [wc0ef] ld b, a - cp $2 + cp BANK(Music2_UpdateMusic) jr nz, .checkForBank08 .bank02 - ld hl, Func_9103 + ld hl, Music2_UpdateMusic jr .asm_2378 .checkForBank08 - cp $8 + cp BANK(Music8_UpdateMusic) jr nz, .bank1F .bank08 - ld hl, Func_21879 + ld hl, Music8_UpdateMusic jr .asm_2378 .bank1F - ld hl, Func_7d177 + ld hl, Music1f_UpdateMusic .asm_2378 ld c, $6 .asm_237a @@ -147,14 +147,14 @@ PlaySound:: ; 23b1 (0:23b1) ld a, [wc0ef] ld [H_LOADEDROMBANK], a ld [$2000], a - cp $2 + cp BANK(Func_9876) jr nz, .checkForBank08 .bank02 ld a, b call Func_9876 jr .asm_240b .checkForBank08 - cp $8 + cp BANK(Func_22035) jr nz, .bank1F .bank08 ld a, b diff --git a/home/init.asm b/home/init.asm index 939e81b5..ef5b5bb9 100644 --- a/home/init.asm +++ b/home/init.asm @@ -128,7 +128,7 @@ ClearVram: StopAllSounds:: - ld a, Bank(Func_9876) + ld a, BANK(Music2_UpdateMusic) ld [wc0ef], a ld [wc0f0], a xor a diff --git a/home/vblank.asm b/home/vblank.asm index ec82eb7d..15f91437 100644 --- a/home/vblank.asm +++ b/home/vblank.asm @@ -56,20 +56,20 @@ VBlank:: ld [H_LOADEDROMBANK], a ld [MBC3RomBank], a - cp BANK(Func_9103) + cp BANK(Music2_UpdateMusic) jr nz, .notbank2 .bank2 - call Func_9103 + call Music2_UpdateMusic jr .afterMusic .notbank2 - cp 8 + cp BANK(Music8_UpdateMusic) jr nz, .bank1F .bank8 call Func_2136e - call Func_21879 + call Music8_UpdateMusic jr .afterMusic .bank1F - call Func_7d177 + call Music1f_UpdateMusic .afterMusic callba Func_18dee ; keep track of time played -- cgit v1.3.1-sl0p From f4e2814381364f295367d1b8da0ad9f73fc565d1 Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Tue, 10 Jun 2014 01:10:11 -0400 Subject: More music bank references Now the AUDIO constants in audio.asm can be edited freely --- engine/oak_speech.asm | 2 +- home/init.asm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'home/init.asm') diff --git a/engine/oak_speech.asm b/engine/oak_speech.asm index 03c41e12..a85449df 100755 --- a/engine/oak_speech.asm +++ b/engine/oak_speech.asm @@ -131,7 +131,7 @@ Func_61bc: ; 61bc (1:61bc) call ResetPlayerSpriteData ld a,[H_LOADEDROMBANK] push af - ld a,2 + ld a, BANK(Music_PalletTown) ld [wc0ef],a ld [wc0f0],a ld a,$A diff --git a/home/init.asm b/home/init.asm index ef5b5bb9..1518218e 100644 --- a/home/init.asm +++ b/home/init.asm @@ -98,7 +98,7 @@ rLCDC_DEFAULT EQU %11100011 ld a, $40 ; PREDEF_SGB_BORDER call Predef - ld a, $1f + ld a, BANK(SFX_1f_67) ld [wc0ef], a ld [wc0f0], a ld a, $9c -- cgit v1.3.1-sl0p From d10108a066c102bf2d167ac656d79308e41f304e Mon Sep 17 00:00:00 2001 From: yenatch Date: Mon, 16 Jun 2014 13:25:46 -0700 Subject: Use macros to define predefs. --- engine/battle/4.asm | 2 +- engine/battle/core.asm | 2 +- engine/hp_bar.asm | 1 + engine/menu/status_screen.asm | 2 +- engine/overworld/pokecenter.asm | 2 +- engine/predefs.asm | 193 ++++++++++++++++++++-------------------- home/init.asm | 6 +- macros.asm | 18 +++- main.asm | 8 +- scripts/redshouse1f.asm | 2 +- 10 files changed, 123 insertions(+), 113 deletions(-) (limited to 'home/init.asm') diff --git a/engine/battle/4.asm b/engine/battle/4.asm index 6e2bad34..11772a15 100755 --- a/engine/battle/4.asm +++ b/engine/battle/4.asm @@ -15,7 +15,7 @@ Func_128ea: ; 128ea (4:68ea) inc b ret -Func_128ef: ; 128ef (4:68ef) +DrawHP: ; 128ef (4:68ef) call GetPredefRegisters ld a, $1 jr asm_128fb diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 21ee9d0d..a1a69a4f 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -6661,7 +6661,7 @@ Func_3eed3: ; 3eed3 (f:6ed3) PlayMoveAnimation: ; 3ef07 (f:6f07) ld [W_ANIMATIONID],a call Delay3 - PREDEF_JUMP MoveAnimationPredef ; predef 8 + predef_jump MoveAnimation InitBattle: ; 3ef12 (f:6f12) ld a, [W_CUROPPONENT] ; wd059 diff --git a/engine/hp_bar.asm b/engine/hp_bar.asm index de0c4e41..9ff9e3cf 100755 --- a/engine/hp_bar.asm +++ b/engine/hp_bar.asm @@ -46,6 +46,7 @@ GetHPBarLength: ; f9df (3:79df) ; predef $48 UpdateHPBar: ; fa1d (3:7a1d) +UpdateHPBar2: push hl ld hl, wHPBarOldHP ld a, [hli] diff --git a/engine/menu/status_screen.asm b/engine/menu/status_screen.asm index 2d33e79f..3bacd306 100755 --- a/engine/menu/status_screen.asm +++ b/engine/menu/status_screen.asm @@ -59,7 +59,7 @@ StatusScreen: ; 12953 (4:6953) call PlaceString ; "TYPE1/" FuncCoord 11,3 ld hl, Coord - PREDEF DrawHPBarPredef ; predef $5f + predef DrawHP ; predef $5f ld hl, wcf25 call GetHealthBarColor ld b, $3 diff --git a/engine/overworld/pokecenter.asm b/engine/overworld/pokecenter.asm index 2dedc437..3c640d8e 100755 --- a/engine/overworld/pokecenter.asm +++ b/engine/overworld/pokecenter.asm @@ -21,7 +21,7 @@ DisplayPokemonCenterDialogue_: ; 6fe6 (1:6fe6) ld a, $18 ld [wSpriteStateData1 + $12], a ; make the nurse turn to face the machine call Delay3 - PREDEF HealPartyPredef + predef HealParty callba AnimateHealingMachine ; do the healing machine animation xor a ld [wMusicHeaderPointer], a diff --git a/engine/predefs.asm b/engine/predefs.asm index 7081df53..53022bc4 100755 --- a/engine/predefs.asm +++ b/engine/predefs.asm @@ -52,105 +52,102 @@ GetPredefPointer: PredefPointers: ; 4fe79 (13:7e79) ; these are pointers to ASM routines. ; they appear to be used in overworld map scripts. - dbw BANK(Func_3cd60),Func_3cd60 - dbw BANK(Func_3f0c6),Func_3f0c6 - dbw BANK(Func_3f073),Func_3f073 - dbw BANK(ScaleSpriteByTwo), ScaleSpriteByTwo - dbw BANK(LoadMonBackPic), LoadMonBackPic - dbw BANK(Func_79aba),Func_79aba - dbw BANK(Func_f132),Func_f132 -HealPartyPredef: ; 4fe8e (13:7e8e) - dbw BANK(HealParty),HealParty -MoveAnimationPredef: ; 4fe91 (13:7e91) - dbw BANK(MoveAnimation),MoveAnimation; 08 play move animation - dbw BANK(DivideBCDPredef),DivideBCDPredef - dbw BANK(DivideBCDPredef),DivideBCDPredef - dbw BANK(AddBCDPredef), AddBCDPredef - dbw BANK(SubBCDPredef), SubBCDPredef - dbw BANK(DivideBCDPredef),DivideBCDPredef - dbw BANK(DivideBCDPredef),DivideBCDPredef - dbw BANK(InitPlayerData), InitPlayerData - dbw BANK(FlagActionPredef),FlagActionPredef - dbw BANK(HideObject), HideObject - dbw BANK(IsObjectHidden), IsObjectHidden - dbw BANK(Func_c69c),Func_c69c - dbw BANK(AnyPartyAlive), AnyPartyAlive - dbw BANK(ShowObject), ShowObject - dbw BANK(ShowObject), ShowObject - dbw BANK(Func_ee9e),Func_ee9e - dbw BANK(InitPlayerData), InitPlayerData - dbw BANK(Func_c754),Func_c754 - dbw BANK(Func_3af5b),Func_3af5b - dbw BANK(LearnMove),LearnMove - dbw BANK(IsItemInBag_),IsItemInBag_ ; 1C, used in Pokémon Tower + add_predef Func_3cd60 + add_predef Func_3f0c6 + add_predef Func_3f073 + add_predef ScaleSpriteByTwo + add_predef LoadMonBackPic + add_predef Func_79aba + add_predef Func_f132 + add_predef HealParty + add_predef MoveAnimation; 08 play move animation + add_predef DivideBCDPredef + add_predef DivideBCDPredef2 + add_predef AddBCDPredef + add_predef SubBCDPredef + add_predef DivideBCDPredef3 + add_predef DivideBCDPredef4 + add_predef InitPlayerData + add_predef FlagActionPredef + add_predef HideObject + add_predef IsObjectHidden + add_predef Func_c69c + add_predef AnyPartyAlive + add_predef ShowObject + add_predef ShowObject2 + add_predef Func_ee9e + add_predef InitPlayerData2 + add_predef Func_c754 + add_predef Func_3af5b + add_predef LearnMove + add_predef IsItemInBag_ ; 1C, used in Pokémon Tower dbw $03,Func_3eb5 ; for these two, the bank number is actually 0 dbw $03,GiveItem - dbw BANK(Func_480eb),Func_480eb - dbw BANK(Func_f8ba),Func_f8ba - dbw BANK(Func_480ff),Func_480ff - dbw BANK(Func_f929),Func_f929 - dbw BANK(Func_f9a0),Func_f9a0 - dbw BANK(Func_48125),Func_48125 - dbw BANK(UpdateHPBar),UpdateHPBar - dbw BANK(HPBarLength), HPBarLength - dbw BANK(Func_5ab0),Func_5ab0 - dbw BANK(Func_3ed02),Func_3ed02 - dbw BANK(ShowPokedexMenu), ShowPokedexMenu - dbw BANK(Func_3ad1c),Func_3ad1c - dbw BANK(SaveSAVtoSRAM0),SaveSAVtoSRAM0 - dbw BANK(InitOpponent),InitOpponent - dbw BANK(Func_5a5f),Func_5a5f - dbw BANK(DrawBadges), DrawBadges - dbw BANK(Func_410f3),Func_410f3 - dbw BANK(BattleTransition),BattleTransition - dbw BANK(Func_79dda),Func_79dda - dbw BANK(PlayIntro),PlayIntro - dbw BANK(Func_79869),Func_79869 - dbw BANK(FlashScreen), FlashScreen - dbw BANK(Func_c586),Func_c586 - dbw BANK(StatusScreen),StatusScreen ; 37 0x12953 - dbw BANK(StatusScreen2),StatusScreen2 ; 38 - dbw BANK(Func_410e2),Func_410e2 - dbw BANK(TrainerEngage), TrainerEngage - dbw BANK(IndexToPokedex),IndexToPokedex - dbw BANK(Predef3B),Predef3B; 3B display pic? - dbw BANK(UsedCut),UsedCut - dbw BANK(ShowPokedexData),ShowPokedexData - dbw BANK(WriteMonMoves),WriteMonMoves - dbw BANK(SaveSAV),SaveSAV - dbw BANK(LoadSGB), LoadSGB - dbw BANK(Func_f113),Func_f113 - dbw BANK(SetPartyMonTypes),SetPartyMonTypes - dbw BANK(CanLearnTM), CanLearnTM - dbw BANK(TMToMove),TMToMove - dbw BANK(Func_71ddf),Func_71ddf - dbw BANK(StarterDex), StarterDex ; 46 - dbw BANK(_AddPartyMon), _AddPartyMon - dbw BANK(UpdateHPBar),UpdateHPBar - dbw BANK(Func_3cdec),Func_3cdec - dbw BANK(LoadTownMap_Nest),LoadTownMap_Nest - dbw BANK(Func_27d6b),Func_27d6b - dbw BANK(EmotionBubble), EmotionBubble; 4C player exclamation - dbw BANK(Func_5aaf),Func_5aaf; return immediately - dbw BANK(AskName), AskName - dbw BANK(PewterGuys),PewterGuys - dbw BANK(SaveSAVtoSRAM2),SaveSAVtoSRAM2 - dbw BANK(LoadSAVCheckSum2),LoadSAVCheckSum2 - dbw BANK(LoadSAV),LoadSAV - dbw BANK(SaveSAVtoSRAM1),SaveSAVtoSRAM1 - dbw BANK(Predef54),Predef54 ; 54 initiate trade - dbw BANK(HallOfFamePC), HallOfFamePC - dbw BANK(DisplayDexRating),DisplayDexRating + add_predef Func_480eb + add_predef Func_f8ba + add_predef Func_480ff + add_predef Func_f929 + add_predef Func_f9a0 + add_predef Func_48125 + add_predef UpdateHPBar + add_predef HPBarLength + add_predef Func_5ab0 + add_predef Func_3ed02 + add_predef ShowPokedexMenu + add_predef Func_3ad1c + add_predef SaveSAVtoSRAM0 + add_predef InitOpponent + add_predef Func_5a5f + add_predef DrawBadges + add_predef Func_410f3 + add_predef BattleTransition + add_predef Func_79dda + add_predef PlayIntro + add_predef Func_79869 + add_predef FlashScreen + add_predef Func_c586 + add_predef StatusScreen + add_predef StatusScreen2 + add_predef Func_410e2 + add_predef TrainerEngage + add_predef IndexToPokedex + add_predef Predef3B; 3B display pic? + add_predef UsedCut + add_predef ShowPokedexData + add_predef WriteMonMoves + add_predef SaveSAV + add_predef LoadSGB + add_predef Func_f113 + add_predef SetPartyMonTypes + add_predef CanLearnTM + add_predef TMToMove + add_predef Func_71ddf + add_predef StarterDex ; 46 + add_predef _AddPartyMon + add_predef UpdateHPBar2 + add_predef Func_3cdec + add_predef LoadTownMap_Nest + add_predef Func_27d6b + add_predef EmotionBubble; 4C player exclamation + add_predef Func_5aaf; return immediately + add_predef AskName + add_predef PewterGuys + add_predef SaveSAVtoSRAM2 + add_predef LoadSAVCheckSum2 + add_predef LoadSAV + add_predef SaveSAVtoSRAM1 + add_predef Predef54 ; 54 initiate trade + add_predef HallOfFamePC + add_predef DisplayDexRating dbw $1E, _LeaveMapAnim ; wrong bank dbw $1E, Func_70510 ; wrong bank - dbw BANK(Func_c5be),Func_c5be - dbw BANK(Func_c60b),Func_c60b - dbw BANK(PrintStrengthTxt), PrintStrengthTxt - dbw BANK(PickupItem),PickupItem - dbw BANK(Func_27d98),Func_27d98 - dbw BANK(LoadMovePPs),LoadMovePPs -DrawHPBarPredef: ; 4ff96 (13:7f96) - dbw BANK(Func_128ef),Func_128ef ; 5F draw HP bar - dbw BANK(Func_128f6),Func_128f6 - dbw BANK(Func_1c9c6),Func_1c9c6 - dbw BANK(OaksAideScript),OaksAideScript + add_predef Func_c5be + add_predef Func_c60b + add_predef PrintStrengthTxt + add_predef PickupItem + add_predef Func_27d98 + add_predef LoadMovePPs + add_predef DrawHP ; 5F + add_predef Func_128f6 + add_predef Func_1c9c6 + add_predef OaksAideScript diff --git a/home/init.asm b/home/init.asm index 1518218e..b79b19d9 100644 --- a/home/init.asm +++ b/home/init.asm @@ -95,8 +95,7 @@ rLCDC_DEFAULT EQU %11100011 ei - ld a, $40 ; PREDEF_SGB_BORDER - call Predef + predef LoadSGB ld a, BANK(SFX_1f_67) ld [wc0ef], a @@ -108,8 +107,7 @@ rLCDC_DEFAULT EQU %11100011 dec a ld [wcfcb], a - ld a, $32 ; PREDEF_INTRO - call Predef + predef PlayIntro call DisableLCD call ClearVram diff --git a/macros.asm b/macros.asm index 2c0d3dfb..a99a80ea 100644 --- a/macros.asm +++ b/macros.asm @@ -138,13 +138,23 @@ TX_BCD: MACRO ENDM ; Predef macro. -PREDEF: MACRO - ld a, (\1 - PredefPointers) / 3 +add_predef: MACRO +\1Predef:: + db BANK(\1) + dw \1 + ENDM + +predef_id: MACRO + ld a, (\1Predef - PredefPointers) / 3 + ENDM + +predef: MACRO + predef_id \1 call Predef ENDM -PREDEF_JUMP: MACRO - ld a, (\1 - PredefPointers) / 3 +predef_jump: MACRO + predef_id \1 jp Predef ENDM diff --git a/main.asm b/main.asm index ef17ad63..324f6a11 100755 --- a/main.asm +++ b/main.asm @@ -494,8 +494,7 @@ TestBattle: ld a, RHYDON ld [W_CUROPPONENT], a - ld a, $2c ; PREDEF_BATTLE - call Predef + predef InitOpponent ; When the battle ends, ; do it all again. @@ -3259,6 +3258,7 @@ IsObjectHidden: ; f1a6 (3:71a6) ; adds missable object (items, leg. pokemon, etc.) to the map ; [wcc4d]: index of the missable object to be added (global index) ShowObject: ; f1c8 (3:71c8) +ShowObject2: ld hl, W_MISSABLEOBJECTFLAGS ld a, [wcc4d] ld c, a @@ -4136,6 +4136,9 @@ HealParty: DivideBCDPredef:: +DivideBCDPredef2:: +DivideBCDPredef3:: +DivideBCDPredef4:: call GetPredefRegisters DivideBCD:: @@ -4347,6 +4350,7 @@ SubBCD:: InitPlayerData: +InitPlayerData2: call Random ld a, [hRandomSub] diff --git a/scripts/redshouse1f.asm b/scripts/redshouse1f.asm index 4bab98fe..0e3e331b 100755 --- a/scripts/redshouse1f.asm +++ b/scripts/redshouse1f.asm @@ -27,7 +27,7 @@ MomHealPokemon: ; 4818a (12:418a) call PrintText call GBFadeOut2 call ReloadMapData - PREDEF HealPartyPredef + predef HealParty ld a, MUSIC_PKMN_HEALED ld [wc0ee], a call PlaySound ; play sound? -- cgit v1.3.1-sl0p