diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-10-29 14:23:30 -0400 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-10-29 14:23:30 -0400 |
| commit | cb414f1480e9117e5d6ee0ab5cb81903e83cde9a (patch) | |
| tree | e44bd6299c61335a9a0476db57b565aadcd0b4d7 /scripts/seafoamislands4.asm | |
| parent | 2ea331ebb341505df1cd8429b140c52e345a5af4 (diff) | |
overworld item & movement code, cable club code, remove more instances of W_, add PIKAHAPPY_TRADE
Also make replace.sh take args
Diffstat (limited to 'scripts/seafoamislands4.asm')
| -rwxr-xr-x | scripts/seafoamislands4.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/scripts/seafoamislands4.asm b/scripts/seafoamislands4.asm index f7407e48..90d282cf 100755 --- a/scripts/seafoamislands4.asm +++ b/scripts/seafoamislands4.asm @@ -41,7 +41,7 @@ SeafoamIslands4Script: ; 4658d (11:658d) ret nz .asm_465ed ld hl, SeafoamIslands4ScriptPointers - ld a, [W_SEAFOAMISLANDS4CURSCRIPT] + ld a, [wSeafoamIslands4CurScript] jp CallFunctionInTable Seafoam4HolesCoords: ; 465f6 (11:65f6) @@ -58,10 +58,10 @@ SeafoamIslands4ScriptPointers: ; 465fb (11:65fb) SeafoamIslands4Script0: ; 46603 (11:6603) CheckBothEventsSet EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE ret z - ld a, [W_YCOORD] + ld a, [wYCoord] cp $8 ret nz - ld a, [W_XCOORD] + ld a, [wXCoord] cp $f ret nz ld hl, wSimulatedJoypadStatesEnd @@ -73,7 +73,7 @@ SeafoamIslands4Script0: ; 46603 (11:6603) ld hl, W_FLAGS_D733 set 2, [hl] ld a, $1 - ld [W_SEAFOAMISLANDS4CURSCRIPT], a + ld [wSeafoamIslands4CurScript], a ret RLEMovement46632: ; 46632 (11:6632) @@ -87,13 +87,13 @@ SeafoamIslands4Script1: ; 46639 (11:6639) and a ret nz ld a, $0 - ld [W_SEAFOAMISLANDS4CURSCRIPT], a + ld [wSeafoamIslands4CurScript], a ret SeafoamIslands4Script2: ; 46644 (11:6644) CheckBothEventsSet EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE ret z - ld a, [W_XCOORD] + ld a, [wXCoord] cp $12 jr z, .asm_4665e cp $13 @@ -116,7 +116,7 @@ SeafoamIslands4Script2: ; 46644 (11:6644) set 2, [hl] ld a, $3 .asm_4667b - ld [W_SEAFOAMISLANDS4CURSCRIPT], a + ld [wSeafoamIslands4CurScript], a ret RLEData_4667f: ; 4667f (11:667f) @@ -137,7 +137,7 @@ SeafoamIslands4Script3: ; 4668f (11:668f) and a ret nz ld a, $0 - ld [W_SEAFOAMISLANDS4CURSCRIPT], a + ld [wSeafoamIslands4CurScript], a ret SeafoamIslands4TextPointers: ; 4669a (11:669a) |