summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
Diffstat (limited to 'main.asm')
-rwxr-xr-xmain.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/main.asm b/main.asm
index 96b22a64..b1e295e1 100755
--- a/main.asm
+++ b/main.asm
@@ -19,7 +19,7 @@ SECTION "bank1",ROMX,BANK[$1]
INCLUDE "data/facing.asm"
-ResetStatusAndHalveMoneyOnBlackout::
+;ResetStatusAndHalveMoneyOnBlackout::
; Reset player status on blackout.
xor a
ld [wBattleResult], a
@@ -2032,9 +2032,9 @@ SECTION "bank3",ROMX,BANK[$3]
INCLUDE "engine/joypad.asm"
-INCLUDE "data/map_songs.asm"
+;INCLUDE "data/map_songs.asm"
-INCLUDE "data/map_header_banks.asm"
+;INCLUDE "data/map_header_banks.asm"
ClearVariablesAfterLoadingMapData: ; c335 (3:4335)
ld a, $90
@@ -4858,7 +4858,7 @@ INCLUDE "data/mapHeaders/fuchsiacity.asm"
INCLUDE "data/mapObjects/fuchsiacity.asm"
FuchsiaCityBlocks: INCBIN "maps/fuchsiacity.blk"
-INCLUDE "engine/play_time.asm"
+INCLUDE "home/play_time.asm"
INCLUDE "scripts/pallettown.asm"
INCLUDE "scripts/viridiancity.asm"
@@ -6671,14 +6671,14 @@ INCLUDE "engine/items/tm_prices.asm"
SECTION "bank3c",ROMX,BANK[$3C]
-INCLUDE "yellow/bank3c/main.asm"
+INCLUDE "engine/bank3c/main.asm"
SECTION "bank3d",ROMX,BANK[$3D]
-INCLUDE "yellow/bank3d/random.asm"
+INCLUDE "engine/bank3d/random.asm"
SECTION "bank3e",ROMX,BANK[$3E]
SECTION "bank3f",ROMX,BANK[$3F]
-INCLUDE "yellow/bank3f/main.asm" \ No newline at end of file
+INCLUDE "engine/bank3f/main.asm" \ No newline at end of file