diff options
| -rwxr-xr-x | main.asm | 9 | ||||
| -rwxr-xr-x | scripts/redshouse2f.asm | 23 |
2 files changed, 19 insertions, 13 deletions
@@ -976,7 +976,14 @@ INCLUDE "engine/overworld/saffron_guards.asm" SECTION "bank17",ROMX,BANK[$17] - dr $5c000,$5da70 + dr $5c000,$5c010 +RedsHouse2FBlocks: +INCBIN "maps/redshouse2f.blk" + dr $5c020,$5c0a4 +INCLUDE "data/mapHeaders/redshouse2f.asm" +INCLUDE "scripts/redshouse2f.asm" +INCLUDE "data/mapObjects/redshouse2f.asm" + dr $5c0d4,$5da70 INCLUDE "engine/evolution.asm" diff --git a/scripts/redshouse2f.asm b/scripts/redshouse2f.asm index 565d09e3..3a0421a6 100755 --- a/scripts/redshouse2f.asm +++ b/scripts/redshouse2f.asm @@ -1,23 +1,22 @@ RedsHouse2FScript: ; 5c0b0 (17:40b0) call EnableAutoTextBoxDrawing - ld hl,RedsHouse2FScriptPointers - ld a,[W_REDSHOUSE2CURSCRIPT] - jp JumpTable + ld hl, RedsHouse2FScriptPointers + ld a, 0 + call JumpTable + ret RedsHouse2FScriptPointers: ; 5c0bc (17:40bc) dw RedsHouse2FScript0 dw RedsHouse2FScript1 + dw RedsHouse2FScript2 + dw RedsHouse2FScript3 + dw RedsHouse2FScript4 -RedsHouse2FScript0: ; 5c0c0 (17:40c0) - xor a - ld [hJoyHeld],a - ld a,PLAYER_DIR_UP - ld [wPlayerMovingDirection],a - ld a,1 - ld [W_REDSHOUSE2CURSCRIPT],a - ret - +RedsHouse2FScript0: ; 5c0ce (17:40ce) RedsHouse2FScript1: ; 5c0ce (17:40ce) +RedsHouse2FScript2: ; 5c0ce (17:40ce) +RedsHouse2FScript3: ; 5c0ce (17:40ce) +RedsHouse2FScript4: ; 5c0ce (17:40ce) ret RedsHouse2FTextPointers: ; 5c0cf (17:40cf) |