summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreinstein95 <einstein95@users.noreply.github.com>2017-01-08 18:41:30 +1300
committereinstein95 <einstein95@users.noreply.github.com>2017-01-08 18:41:30 +1300
commitf2c38581b05ccddd18cd937b3552958de9353696 (patch)
treeec9d16a47e8a28f927c86377b6dc32fe6229aae9
parent212eb2102c9b825a1a66746e1d19653675cd9780 (diff)
parent7c3a90bf0181127fab4cd98ad4a3173a2984f51e (diff)
Okay git, I'll do this
-rwxr-xr-xengine/predefs.asm5
-rwxr-xr-xscripts/ceruleangym.asm4
2 files changed, 3 insertions, 6 deletions
diff --git a/engine/predefs.asm b/engine/predefs.asm
index d689318d..605cba3a 100755
--- a/engine/predefs.asm
+++ b/engine/predefs.asm
@@ -58,10 +58,7 @@ PredefPointers::
add_predef ScaleSpriteByTwo
add_predef LoadMonBackPic
add_predef CopyDownscaledMonTiles
-; add_predef LoadMissableObjects
-; For some reason this points to the middle of the "ld de, wMissableObjectList" instruction in LoadMissableObjects
- db 3
- dw $714D
+ dbw $03,JumpMoveEffect ; wrong bank
add_predef HealParty
add_predef MoveAnimation
add_predef DivideBCDPredef
diff --git a/scripts/ceruleangym.asm b/scripts/ceruleangym.asm
index 5d6138d9..a1e772ef 100755
--- a/scripts/ceruleangym.asm
+++ b/scripts/ceruleangym.asm
@@ -17,10 +17,10 @@ CeruleanGymScript_5c6d0:
jp LoadGymLeaderAndCityName
Gym2CityName:
- db "AZURIA@"
+ db "AZURIA CITY@"
Gym2LeaderName:
- db "ONDINE@"
+ db "MISTY@"
CeruleanGymScript_5c6ed:
xor a