diff options
| author | dannye <33dannye@gmail.com> | 2020-11-04 00:06:44 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2020-11-04 00:06:44 -0600 |
| commit | 5647ca687b92954dcf37a6ea6bfbc9a341c32de4 (patch) | |
| tree | dde1937a1bfdb3a835f4155e1c2eb8f1aaf86f63 /engine/bank3c.asm | |
| parent | Merge pull request #55 from Deokishisu/patch-1 (diff) | |
| download | pokeyellow-5647ca687b92954dcf37a6ea6bfbc9a341c32de4.tar.gz pokeyellow-5647ca687b92954dcf37a6ea6bfbc9a341c32de4.tar.xz pokeyellow-5647ca687b92954dcf37a6ea6bfbc9a341c32de4.zip | |
Sync with pokered
Diffstat (limited to 'engine/bank3c.asm')
| -rw-r--r-- | engine/bank3c.asm | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/engine/bank3c.asm b/engine/bank3c.asm index 9c0e281f..8eb32837 100644 --- a/engine/bank3c.asm +++ b/engine/bank3c.asm @@ -1,9 +1,9 @@ INCLUDE "engine/pikachu_pcm.asm" INCLUDE "engine/overworld/advance_player_sprite.asm" -INCLUDE "engine/black_out.asm" +INCLUDE "engine/events/black_out.asm" -SetMapSpecificScriptFlagsOnMapReload: +SetMapSpecificScriptFlagsOnMapReload:: ld a, [wCurMap] cp VERMILION_GYM ; ??? new thing about verm gym? jr z, .verm_gym @@ -65,7 +65,7 @@ BeachHouse_Block: Func_f0a54: ret -LoadUnusedBluesHouseMissableObjectData: +LoadUnusedBluesHouseMissableObjectData:: ; referenced in an unused function ld hl, .MissableObjectsMaps .loop @@ -112,7 +112,7 @@ TryApplyPikachuMovementData: ret nz push hl push bc - callab GetPikachuFacingDirectionAndReturnToE + callfar GetPikachuFacingDirectionAndReturnToE pop bc pop hl ld a, b @@ -123,12 +123,12 @@ TryApplyPikachuMovementData: push af ld a, $ff ld [wUpdateSpritesEnabled], a - callab LoadPikachuShadowIntoVRAM + callfar LoadPikachuShadowIntoVRAM pop af ld [wUpdateSpritesEnabled], a pop hl call ApplyPikachuMovementData - callab RefreshPikachuFollow + callfar RefreshPikachuFollow ret Pic_f0abf: @@ -140,7 +140,7 @@ INCBIN "gfx/pikachu/unknown_f0cf4.pic" GFX_f0d82: INCBIN "gfx/pikachu/unknown_f0d82.2bpp" -PokecenterChanseyText: +PokecenterChanseyText:: ld hl, NurseChanseyText call PrintText ld a, CHANSEY @@ -149,10 +149,10 @@ PokecenterChanseyText: ret NurseChanseyText: - TX_FAR _NurseChanseyText - db "@" + text_far _NurseChanseyText + text_end -INCLUDE "engine/HoF_room_pc.asm" +INCLUDE "engine/movie/credits.asm" INCLUDE "scripts/ViridianCity2.asm" INCLUDE "scripts/VermilionCity2.asm" INCLUDE "scripts/CeladonCity2.asm" @@ -173,11 +173,11 @@ INCLUDE "scripts/SafariZoneGate2.asm" INCLUDE "scripts/CinnabarGym3.asm" INCLUDE "scripts/MtMoonPokecenter2.asm" -INCLUDE "data/mapHeaders/BeachHouse.asm" +INCLUDE "data/maps/headers/BeachHouse.asm" INCLUDE "scripts/BeachHouse.asm" BeachHouse_Blocks: INCBIN "maps/BeachHouse.blk" -INCLUDE "data/mapObjects/BeachHouse.asm" +INCLUDE "data/maps/objects/BeachHouse.asm" INCLUDE "scripts/BeachHouse2.asm" INCLUDE "scripts/BillsHouse2.asm" |