diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-03-08 19:54:06 -0500 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-03-08 19:54:06 -0500 |
| commit | f2fa5349d5c5db627f49cbfef44086c201e473cc (patch) | |
| tree | 924a3a473d2ccf81e658f1a031f72a490c522d8c /maps | |
| parent | f31da089bbd46f56d488b5657f08f8595490e51e (diff) | |
More annotations of HP bar animations, including an oversight by GameFreak resulting in super-slow HP bars for Pokemon with over 48 HP
Diffstat (limited to 'maps')
| -rw-r--r-- | maps/BlackthornGym2F.asm | 10 | ||||
| -rw-r--r-- | maps/IcePathB1F.asm | 12 |
2 files changed, 11 insertions, 11 deletions
diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm index d77464877..02a4d2234 100644 --- a/maps/BlackthornGym2F.asm +++ b/maps/BlackthornGym2F.asm @@ -23,8 +23,8 @@ BlackthornGym2F_MapScriptHeader: return .BoulderCmdQueue - dbw MAPCALLBACK_OBJECTS, .BoulderTable ; check if any stones are sitting on a warp - db 0, 0 ; filler + dbw CMDQUEUE_STONETABLE, .BoulderTable ; check if any stones are sitting on a warp + dw 0 ; filler .BoulderTable stonetable 5, BLACKTHORNGYM2F_BOULDER1, .Disappear4 @@ -137,9 +137,9 @@ BlackthornGym2F_MapEventHeader: db 5 warp_def $7, $1, 3, BLACKTHORN_GYM_1F warp_def $9, $7, 4, BLACKTHORN_GYM_1F - warp_def $5, $2, 5, BLACKTHORN_GYM_1F - warp_def $7, $8, 6, BLACKTHORN_GYM_1F - warp_def $3, $8, 7, BLACKTHORN_GYM_1F + warp_def $5, $2, 5, BLACKTHORN_GYM_1F ; hole + warp_def $7, $8, 6, BLACKTHORN_GYM_1F ; hole + warp_def $3, $8, 7, BLACKTHORN_GYM_1F ; hole .XYTriggers: db 0 diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm index 9e9390f67..afac65352 100644 --- a/maps/IcePathB1F.asm +++ b/maps/IcePathB1F.asm @@ -21,8 +21,8 @@ IcePathB1F_MapScriptHeader: return .CommandQueue: - dbw MAPCALLBACK_OBJECTS, .StoneTable ; check if any stones are sitting on a warp - db 0, 0 ; filler + dbw CMDQUEUE_STONETABLE, .StoneTable ; check if any stones are sitting on a warp + dw 0 ; filler .StoneTable: stonetable 3, ICEPATHB1F_BOULDER1, .Boulder1 @@ -90,10 +90,10 @@ IcePathB1F_MapEventHeader: db 8 warp_def $f, $3, 3, ICE_PATH_1F warp_def $3, $11, 1, ICE_PATH_B2F_MAHOGANY_SIDE - warp_def $2, $b, 3, ICE_PATH_B2F_MAHOGANY_SIDE - warp_def $7, $4, 4, ICE_PATH_B2F_MAHOGANY_SIDE - warp_def $c, $5, 5, ICE_PATH_B2F_MAHOGANY_SIDE - warp_def $d, $c, 6, ICE_PATH_B2F_MAHOGANY_SIDE + warp_def $2, $b, 3, ICE_PATH_B2F_MAHOGANY_SIDE ; hole + warp_def $7, $4, 4, ICE_PATH_B2F_MAHOGANY_SIDE ; hole + warp_def $c, $5, 5, ICE_PATH_B2F_MAHOGANY_SIDE ; hole + warp_def $d, $c, 6, ICE_PATH_B2F_MAHOGANY_SIDE ; hole warp_def $19, $5, 4, ICE_PATH_1F warp_def $1b, $b, 1, ICE_PATH_B2F_BLACKTHORN_SIDE |