diff options
| author | ehw <Knuckles500@gmail.com> | 2018-06-09 20:46:19 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-09 20:46:19 -0400 |
| commit | b3c6219cf11ff85f76f13eeb955e90c951cfe031 (patch) | |
| tree | 608ba6e020a8062301b338744d7481ca3f7b8428 | |
| parent | 311187e6c8dcccf7ef69085f2d69cda0dc8d9ab8 (diff) | |
Update shim and title.asm
include vram.asm no longer needed, some function name changes
| -rw-r--r-- | engine/title.asm | 4 | ||||
| -rw-r--r-- | shim.sym | 14 |
2 files changed, 13 insertions, 5 deletions
diff --git a/engine/title.asm b/engine/title.asm index 432c9c1..a8ea9b9 100644 --- a/engine/title.asm +++ b/engine/title.asm @@ -1,5 +1,5 @@ INCLUDE "constants.asm" -INCLUDE "vram.asm" +; INCLUDE "vram.asm" SECTION "Title screen", ROMX[$5D8C], BANK[$01] @@ -30,7 +30,7 @@ TitleSequenceStart:: ld a, $01 ldh [hBGMapMode], a call ClearTileMap - call ResetPalette + call UpdateTimePals ld a, [wJumptableIndex + 1] ld e, a @@ -20,6 +20,7 @@ 00:2C05 StartMenuCheck 00:3171 Function3171 +00:361E ClearPalettesAndWait 00:3621 WaitBGMap 00:362B SetPalettes 00:3634 ClearPalettes @@ -28,6 +29,7 @@ 00:3648 SetHPPal 00:3655 SetHPPal.done 00:39BA PlayCry +00:3CA8 InitSpriteAnimStruct 00:3D86 WaitSFX 00:3D87 WaitSFX.wait 00:3DA5 MaxVolume @@ -47,10 +49,10 @@ 01:4031 Function4031 +01:4031 DebugMenu 01:5190 _UpdateSprites 01:53CC MainMenu 01:5D27 Function5d27 -01:6114 TitleScreenInputAndTimeout 01:63D8 ReanchorBGMap_NoOAMUpdate 01:6437 LoadFonts_NoOAMUpdate 01:6445 Function6445 @@ -66,6 +68,7 @@ 02:4C7C DrawMap 02:4DC2 TownMapGfx 02:4F32 PokegearRadioGfx +02:51D2 SetTitleBGDecorationBorder 02:528B Function928b 02:5695 CheckSGB @@ -107,6 +110,7 @@ 05:405B AddIndoorSprites 05:40AA AddOutdoorSprites 05:40FB LoadUsedSpritesGfx ; TODO: maybe there's a better name +05:43B6 InitAllSRAMBanks 05:43E0 Function143e0 05:457A Function1457a 05:45B8 Function145b8 @@ -180,7 +184,9 @@ 23:44BE Function8c4be 23:4940 Function8c940 23:49C6 Function8c9c6 -23:60CC MenuMonIconGfx +23:4CFD InitEffectObject +23:4d13 EffectObjectJumpNoDelay +23:60cc MenuMonIconGfx 24:4000 SetClockDialog 24:4239 SlotMachineGame @@ -429,7 +435,9 @@ 36:73E8 MtFujiRoute_MapAttributes 36:7444 FontoRoute5_MapAttributes 36:7530 BullForestRoute3_MapAttributes - +38:4000 PikachuMiniGame +39:4000 GameFreakIntro +39:432F OpeningCutscene 3A:441D Functione841d 3A:45D8 Functione85d8 3A:47F9 Functione87f9 |