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/main.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 'engine/bank3d/main.asm')
| -rw-r--r-- | engine/bank3d/main.asm | 5 |
1 files changed, 3 insertions, 2 deletions
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 |