diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2013-09-08 11:18:39 -0500 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2013-09-08 11:18:39 -0500 |
| commit | 5c4dc08ee451f699471ce69fc8f98265bc80939d (patch) | |
| tree | 33223a7ef5c01b7fbf4a3a3a176c65b237d5e5ab /maps/PowerPlant.asm | |
| parent | d4aa6edfa744a45cc82b20cd813462af870b6fef (diff) | |
| parent | 740f91370db08d2e30c16f34be83c6d14e7d1c60 (diff) | |
Merge branch 'master' into refactor-preprocessor
Diffstat (limited to 'maps/PowerPlant.asm')
| -rw-r--r-- | maps/PowerPlant.asm | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm index 8fe259a32..9247de7a8 100644 --- a/maps/PowerPlant.asm +++ b/maps/PowerPlant.asm @@ -45,9 +45,9 @@ UnknownScript_0x188dc5: ; 0x188dc5 OfficerScript_0x188df5: ; 0x188df5 faceplayer loadfont - checkbit1 $00c9 + checkbit1 EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x188e0f - checkbit1 $00ca + checkbit1 EVENT_MET_MANAGER_AT_POWER_PLANT iftrue UnknownScript_0x188e09 2writetext UnknownText_0x188ee0 closetext @@ -72,7 +72,7 @@ UnknownScript_0x188e0f: ; 0x188e0f GymGuyScript_0x188e15: ; 0x188e15 faceplayer loadfont - checkbit1 $00c9 + checkbit1 EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x188e23 2writetext UnknownText_0x188fcf closetext @@ -90,7 +90,7 @@ UnknownScript_0x188e23: ; 0x188e23 GymGuyScript_0x188e29: ; 0x188e29 faceplayer loadfont - checkbit1 $00c9 + checkbit1 EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x188e37 2writetext UnknownText_0x189079 closetext @@ -108,7 +108,7 @@ UnknownScript_0x188e37: ; 0x188e37 OfficerScript_0x188e3d: ; 0x188e3d faceplayer loadfont - checkbit1 $00c9 + checkbit1 EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x188e4b 2writetext UnknownText_0x18910e closetext @@ -126,7 +126,7 @@ UnknownScript_0x188e4b: ; 0x188e4b GymGuyScript_0x188e51: ; 0x188e51 faceplayer loadfont - checkbit1 $00c9 + checkbit1 EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x188e5f 2writetext UnknownText_0x1891c2 closetext @@ -144,18 +144,18 @@ UnknownScript_0x188e5f: ; 0x188e5f FisherScript_0x188e65: ; 0x188e65 faceplayer loadfont - checkbit1 $00c9 + checkbit1 EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x188eac checkitem MACHINE_PART iftrue UnknownScript_0x188e93 - checkbit1 $00ca + checkbit1 EVENT_MET_MANAGER_AT_POWER_PLANT iftrue UnknownScript_0x188e8d 2writetext UnknownText_0x189264 closetext loadmovesprites - setbit1 $00ca + setbit1 EVENT_MET_MANAGER_AT_POWER_PLANT clearbit1 $076d - clearbit1 $00fb + clearbit1 EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM domaptrigger GROUP_CERULEAN_GYM, MAP_CERULEAN_GYM, $1 dotrigger $1 end @@ -172,20 +172,20 @@ UnknownScript_0x188e93: ; 0x188e93 2writetext UnknownText_0x18936e keeptextopen takeitem MACHINE_PART, 1 - setbit1 $00c9 + setbit1 EVENT_RETURNED_MACHINE_PART clearbit1 $0772 setbit1 $0771 setbit1 $076c - setbit1 $00cd + setbit1 EVENT_RESTORED_POWER_TO_KANTO clearbit1 $0749 UnknownScript_0x188eac: ; 0x188eac - checkbit1 $00df + checkbit1 EVENT_GOT_TM07_ZAP_CANNON iftrue UnknownScript_0x188ec5 2writetext UnknownText_0x1893c4 keeptextopen verbosegiveitem TM_07, 1 iffalse UnknownScript_0x188ec3 - setbit1 $00df + setbit1 EVENT_GOT_TM07_ZAP_CANNON 2writetext UnknownText_0x1893f4 closetext UnknownScript_0x188ec3: ; 0x188ec3 |