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/bank3d | |
| 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/bank3d')
| -rw-r--r-- | engine/bank3d/bank3d_battle.asm | 20 | ||||
| -rw-r--r-- | engine/bank3d/main.asm | 5 |
2 files changed, 13 insertions, 12 deletions
diff --git a/engine/bank3d/bank3d_battle.asm b/engine/bank3d/bank3d_battle.asm index 5c5acd15..1f84d314 100644 --- a/engine/bank3d/bank3d_battle.asm +++ b/engine/bank3d/bank3d_battle.asm @@ -1,10 +1,10 @@ InitBattle: ; f5ff2 (3d:5ff2) - ld a, [W_CUROPPONENT] + ld a, [wCurOpponent] and a jr z, asm_f6003 InitOpponent: ; f5ff8 (3d:5ff8) - ld a, [W_CUROPPONENT] + ld a, [wCurOpponent] ld [wcf91], a ld [wEnemyMonSpecies2], a jr asm_f601d @@ -47,10 +47,10 @@ asm_f601d: ; f601d (f:601d) ld a, $ff ld [wEnemyMonPartyPos], a ld a, $2 - ld [W_ISINBATTLE], a + ld [wIsInBattle], a ; Is this a major story battle? - ld a,[W_LONEATTACKNO] + ld a,[wLoneAttackNo] and a jp z,InitBattle_Common callabd_ModifyPikachuHappiness PIKAHAPPY_GYMLEADER ; useless since already in bank3d @@ -58,16 +58,16 @@ asm_f601d: ; f601d (f:601d) InitWildBattle: ; f607c (3d:607c) ld a, $1 - ld [W_ISINBATTLE], a + ld [wIsInBattle], a callab LoadEnemyMonData callab DoBattleTransitionAndInitBattleVariables - ld a, [W_CUROPPONENT] + ld a, [wCurOpponent] cp MAROWAK jr z, .isGhost callab IsGhostBattle jr nz, .isNoGhost .isGhost - ld hl, W_MONHSPRITEDIM + ld hl, wMonHSpriteDim ld a, $66 ld [hli], a ; write sprite dimensions ld bc, GhostPic @@ -131,7 +131,7 @@ InitBattle_Common: ; f60eb (3d:60eb) ld bc, $40a call ClearScreenArea call ClearSprites - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] dec a ; is it a wild battle? ld hl, DrawEnemyHUDAndHPBar ld b,BANK(DrawEnemyHUDAndHPBar) @@ -175,7 +175,7 @@ LoadMonBackPic: ; f6178 (3d:6178) coord hl, 1, 5 ld bc,$708 call ClearScreenArea - ld hl, W_MONHBACKSPRITE - W_MONHEADER + ld hl, wMonHBackSprite - wMonHeader call UncompressMonSprite predef ScaleSpriteByTwo ld de, vBackPic @@ -195,7 +195,7 @@ Func_f61a6: ; f61a6 (3d:f61a6) ld a, [$ffe1] ld [H_DOWNARROWBLINKCNT1], a ld b, $4c - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] and a jr z, .asm_f61ef add b diff --git a/engine/bank3d/main.asm b/engine/bank3d/main.asm index 131f4fca..c64dd26f 100644 --- a/engine/bank3d/main.asm +++ b/engine/bank3d/main.asm @@ -461,7 +461,7 @@ Func_f5b2d:: ; f5b2d (3d:5b2d) ld a,[wd732] bit 5,a jr nz,.asm_f5b59 - ld a,[W_CURMAP] + ld a,[wCurMap] cp SEAFOAM_ISLANDS_5 ret nz ld a,[wd881] @@ -640,12 +640,13 @@ RemoveItemFromInventory_: ; f5be1 (3d:5be1) ret TrainerInfoTextBoxTileGraphics: INCBIN "gfx/trainer_info.2bpp" +TrainerInfoTextBoxTileGraphicsEnd: BlankLeaderNames: INCBIN "gfx/blank_leader_names.2bpp" CircleTile: INCBIN "gfx/circle_tile.2bpp" BadgeNumbersTileGraphics: INCBIN "gfx/badge_numbers.2bpp" ReadSuperRodData:: ; f5ea4 (3d:5ea4) - ld a,[W_CURMAP] + ld a,[wCurMap] ld c,a ld hl,FishingSlots .loop |