summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-05-24 18:54:06 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-05-24 18:54:06 -0400
commit87b20762d539888b031aba92b574108f5f817815 (patch)
tree6a431083c23d83935f920ea0360574be365796b5 /main.asm
parent219eddf056933c6e5f06903caa73d49de3118a60 (diff)
Numerous changes (see below)
* Fix build errors from previous commit * Fix predef text pointers * Disassemble hidden object data and additional accessory functions
Diffstat (limited to 'main.asm')
-rwxr-xr-xmain.asm10
1 files changed, 4 insertions, 6 deletions
diff --git a/main.asm b/main.asm
index b32935de..a106b3a3 100755
--- a/main.asm
+++ b/main.asm
@@ -674,7 +674,9 @@ SECTION "bank11",ROMX,BANK[$11]
INCLUDE "engine/pokedex_rating.asm"
- dr $44251,$45077
+ dr $44251,$443b7
+Mansion1Script_Switches:
+ dr $443b7,$45077
LoadSpinnerArrowTiles: ; 45077 (11:5077)
dr $45077,$46bf3
@@ -850,12 +852,8 @@ VendingMachineMenu: ; 74726 (1d:4726)
dr $74726,$75dfe
PKMNLeaguePC: ; 75dfe (1d:5dfe)
dr $75dfe,$75f74
-HiddenItems: ; 75f74 (1d:5f74)
- dr $75f74,$75faa
-INCLUDE "data/hidden_item_coords.asm"
-
- dr $76050,$76177
+INCLUDE "engine/overworld/hidden_items.asm"
SECTION "bank1E",ROMX,BANK[$1E]