summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authorlibjet <libj3t@gmail.com>2020-05-28 19:47:18 +0100
committerlibjet <libj3t@gmail.com>2020-05-28 19:47:18 +0100
commit0cf765a4f521ecd3ef2f7e9e89f1fa3fddb006c4 (patch)
tree28f80a786579a8ce27dab7ea11e67682fb87ef99 /main.asm
parent2e0371d637d9c62d97e20e0f75e4034fc755aab1 (diff)
Add halloffame.asm and credits.asm
Diffstat (limited to 'main.asm')
-rw-r--r--main.asm34
1 files changed, 21 insertions, 13 deletions
diff --git a/main.asm b/main.asm
index e89ec4c2..354df6d3 100644
--- a/main.asm
+++ b/main.asm
@@ -228,14 +228,8 @@ INCLUDE "engine/printer/printer.asm"
AnimObj00GFX:
dr $84a2a, $8640a
-HallOfFame::
- dr $8640a, $86446
-RedCredits::
- dr $86446, $86632
-_HallOfFamePC::
- dr $86632, $87b65
-
-INCLUDE "data/credits_strings_pointers.asm"
+INCLUDE "engine/events/halloffame.asm"
+INCLUDE "engine/movie/credits.asm"
SECTION "bank23", ROMX
@@ -313,7 +307,11 @@ FreezeMonIcons::
UnfreezeMonIcons::
dr $8e922, $8e93d
HoldSwitchmonIcon::
- dr $8e93d, $8fe43
+ dr $8e93d, $8fdbe
+InitDisplayForHallOfFame::
+ dr $8fdbe, $8fdff
+InitDisplayForRedCredits::
+ dr $8fdff, $8fe43
ELIF DEF(_SILVER)
dr $8d332, $8e6e3
@@ -332,7 +330,11 @@ FreezeMonIcons::
UnfreezeMonIcons::
dr $8e908, $8e923
HoldSwitchmonIcon::
- dr $8e923, $8fe29
+ dr $8e923, $8fda4
+InitDisplayForHallOfFame::
+ dr $8fda4, $8fde5
+InitDisplayForRedCredits::
+ dr $8fde5, $8fe43
ENDC
@@ -397,7 +399,9 @@ DummyPredef2F::
INCLUDE "data/moves/animations.asm"
LoadPoisonBGPals::
- dr $cbc76, $cbdba
+ dr $cbc76, $cbcbd
+TheEndGFX::
+ dr $cbcbd, $cbdba
SECTION "Move Animations", ROMX
@@ -512,7 +516,10 @@ LoadHPBar::
StatsScreen_LoadFont::
dr $f80a6, $f80d9
LoadStatsScreenPageTilesGFX::
- dr $f80d9, $f8aa2
+ dr $f80d9, $f80f2
+
+FontExtra:
+ dr $f80f2, $f8aa2
StatsScreenPageTilesGFX::
dr $f8aa2, $f8bb2
EnemyHPBarBorderGFX::
@@ -523,13 +530,14 @@ ExpBarGFX::
dr $f8c02, $f8c92
TownMapGFX::
dr $f8c92, $f930e
-
Footprints::
dr $f930e, $fb30e
UnownFont::
dr $fb30e, $fb4be
+
INCLUDE "data/collision_permissions.asm"
+
Shrink1Pic::
dr $fb5be, $fb64e
Shrink2Pic::