diff options
| author | yenatch <yenatch@gmail.com> | 2018-01-22 01:06:48 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-22 01:06:48 -0500 |
| commit | c60f1331fef22b886adf3472d2b4f348832cfaf7 (patch) | |
| tree | 5a471fad61e406f5b3ca1aba67ced0186de01c52 /maps/PowerPlant.asm | |
| parent | f27f79488a460f0a89670f3611e1e9e175baf5d6 (diff) | |
| parent | 7fba864883732ccecb1221ae7ff97492d112362a (diff) | |
Merge pull request #456 from Rangi42/master
OAM data documentation; move more content into data/; move palettes into gfx/; more code+script constants; consistent map naming
Diffstat (limited to 'maps/PowerPlant.asm')
| -rw-r--r-- | maps/PowerPlant.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm index 371ef6c58..ef855e40e 100644 --- a/maps/PowerPlant.asm +++ b/maps/PowerPlant.asm @@ -7,7 +7,7 @@ const_value set 2 const POWERPLANT_FISHER const POWERPLANT_FOREST -PowerPlant_MapScriptHeader: +PowerPlant_MapScripts: .SceneScripts: db 2 scene_script .DummyScene0 @@ -42,7 +42,7 @@ PowerPlantGuardPhoneScript: closetext spriteface PLAYER, DOWN applymovement POWERPLANT_OFFICER1, MovementData_0x188eda - setscene $0 + setscene 0 end OfficerScript_0x188df5: @@ -148,8 +148,8 @@ PowerPlantManager: setevent EVENT_MET_MANAGER_AT_POWER_PLANT clearevent EVENT_CERULEAN_GYM_ROCKET clearevent EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM - setmapscene CERULEAN_GYM, $1 - setscene $1 + setmapscene CERULEAN_GYM, 1 + setscene 1 end UnknownScript_0x188e8d: @@ -388,7 +388,7 @@ UnknownText_0x189475: line "electricity out!" done -PowerPlant_MapEventHeader: +PowerPlant_MapEvents: ; filler db 0, 0 |