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 /engine/bank3c | |
| 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 'engine/bank3c')
| -rw-r--r-- | engine/bank3c/main.asm | 8 | ||||
| -rw-r--r-- | engine/bank3c/overworld.asm | 16 |
2 files changed, 12 insertions, 12 deletions
diff --git a/engine/bank3c/main.asm b/engine/bank3c/main.asm index 6253f971..468a6412 100644 --- a/engine/bank3c/main.asm +++ b/engine/bank3c/main.asm @@ -161,7 +161,7 @@ ResetStatusAndHalveMoneyOnBlackout:: ; f0274 (3c:4274) xor a ; gamefreak copypasting functions (double xor a) ld [wBattleResult], a ld [wWalkBikeSurfState], a - ld [W_ISINBATTLE], a + ld [wIsInBattle], a ld [wMapPalOffset], a ld [wNPCMovementScriptFunctionNum], a ld [hJoyHeld], a @@ -204,7 +204,7 @@ ResetStatusAndHalveMoneyOnBlackout:: ; f0274 (3c:4274) predef_jump HealParty Func_f02da:: ; f02da (3c:42da) - ld a,[W_CURMAP] + ld a,[wCurMap] cp VERMILION_GYM ; ??? new thing about verm gym? jr z,.asm_f02ee ld c,a @@ -248,7 +248,7 @@ Func_f0a55:: ; f0a55 (3c:4a55) cp a,$ff ret z ld b,a - ld a,[W_CURMAP] + ld a,[wCurMap] cp b jr z,.asm_f0a68 inc hl @@ -263,7 +263,7 @@ Func_f0a55:: ; f0a55 (3c:4a55) ld a,[hli] ld h,[hl] ld l,a - ld de,W_MISSABLEOBJECTLIST + ld de,wMissableObjectList call CopyData ret diff --git a/engine/bank3c/overworld.asm b/engine/bank3c/overworld.asm index d7e6274f..e02fb129 100644 --- a/engine/bank3c/overworld.asm +++ b/engine/bank3c/overworld.asm @@ -9,12 +9,12 @@ _AdvancePlayerSprite:: ; f010c (3c:410c) ; if it's the end of the animation, update the player's map coordinates ld hl, wd430 res 5, [hl] - ld a,[W_YCOORD] + ld a,[wYCoord] add b - ld [W_YCOORD],a - ld a,[W_XCOORD] + ld [wYCoord],a + ld a,[wXCoord] add c - ld [W_XCOORD],a + ld [wXCoord],a .afterUpdateMapCoords ld a,[wWalkCounter] ; walking animation counter cp a,$07 @@ -81,7 +81,7 @@ _AdvancePlayerSprite:: ; f010c (3c:410c) and a jr z,.pointlessJump ; mistake? .pointlessJump - ld hl,W_XBLOCKCOORD + ld hl,wXBlockCoord ld a,[hl] add c ld [hl],a @@ -107,7 +107,7 @@ _AdvancePlayerSprite:: ; f010c (3c:410c) call MoveTileBlockMapPointerWest jr .updateMapView .adjustYCoordWithinBlock - ld hl,W_YBLOCKCOORD + ld hl,wYBlockCoord ld a,[hl] add b ld [hl],a @@ -119,7 +119,7 @@ _AdvancePlayerSprite:: ; f010c (3c:410c) ld hl,wYOffsetSinceLastSpecialWarp inc [hl] ld de,wCurrentTileBlockMapViewPointer - ld a,[W_CURMAPWIDTH] + ld a,[wCurMapWidth] call MoveTileBlockMapPointerSouth jr .updateMapView .checkForMoveToNorthBlock @@ -131,7 +131,7 @@ _AdvancePlayerSprite:: ; f010c (3c:410c) ld hl,wYOffsetSinceLastSpecialWarp dec [hl] ld de,wCurrentTileBlockMapViewPointer - ld a,[W_CURMAPWIDTH] + ld a,[wCurMapWidth] call MoveTileBlockMapPointerNorth .updateMapView call LoadCurrentMapView |