diff options
| author | U-Daniel-PC\Daniel <corrnondacqb@yahoo.com> | 2015-06-05 14:01:18 -0500 |
|---|---|---|
| committer | U-Daniel-PC\Daniel <corrnondacqb@yahoo.com> | 2015-06-05 15:10:39 -0500 |
| commit | d48ea223eaad84af95e4f29043c279b56aa4ae88 (patch) | |
| tree | 2fd8807ed257d9d9f03e351c2d6a71d7b208d671 /main.asm | |
| parent | Merge branch 'master' of https://github.com/iimarckus/pokered (diff) | |
| download | pokeyellow-d48ea223eaad84af95e4f29043c279b56aa4ae88.tar.gz pokeyellow-d48ea223eaad84af95e4f29043c279b56aa4ae88.tar.xz pokeyellow-d48ea223eaad84af95e4f29043c279b56aa4ae88.zip | |
Fix a lot of bugs
Diffstat (limited to 'main.asm')
| -rwxr-xr-x | main.asm | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -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 |