summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
Diffstat (limited to 'main.asm')
-rwxr-xr-xmain.asm19
1 files changed, 11 insertions, 8 deletions
diff --git a/main.asm b/main.asm
index a3088c40..96b22a64 100755
--- a/main.asm
+++ b/main.asm
@@ -4772,7 +4772,6 @@ INCLUDE "engine/battle/moveEffects/recoil_effect.asm"
INCLUDE "engine/battle/moveEffects/conversion_effect.asm"
INCLUDE "engine/battle/moveEffects/haze_effect.asm"
INCLUDE "engine/battle/get_trainer_name.asm"
-INCLUDE "engine/random.asm"
SECTION "NPC Sprites 2", ROMX, BANK[NPC_SPRITES_2]
@@ -6670,12 +6669,16 @@ INCLUDE "engine/overworld/elevator.asm"
INCLUDE "engine/items/tm_prices.asm"
-IF DEF(_OPTION_BEACH_HOUSE)
-SECTION "bank3C",ROMX[$4314],BANK[$3C]
+SECTION "bank3c",ROMX,BANK[$3C]
-BeachHouse_GFX:
- INCBIN "gfx/tilesets/beachhouse.2bpp"
+INCLUDE "yellow/bank3c/main.asm"
-BeachHouse_Block:
- INCBIN "gfx/blocksets/beachhouse.bst"
-ENDC
+SECTION "bank3d",ROMX,BANK[$3D]
+
+INCLUDE "yellow/bank3d/random.asm"
+
+SECTION "bank3e",ROMX,BANK[$3E]
+
+SECTION "bank3f",ROMX,BANK[$3F]
+
+INCLUDE "yellow/bank3f/main.asm" \ No newline at end of file