diff options
Diffstat (limited to 'maps')
| -rw-r--r-- | maps/BluesHouse.asm | 2 | ||||
| -rw-r--r-- | maps/RadioTower1F.asm | 18 | ||||
| -rw-r--r-- | maps/UndergroundWarehouse.asm | 4 | ||||
| -rw-r--r-- | maps/WarehouseEntrance.asm | 16 |
4 files changed, 20 insertions, 20 deletions
diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm index 60b9aa009..6639cbfc3 100644 --- a/maps/BluesHouse.asm +++ b/maps/BluesHouse.asm @@ -23,7 +23,7 @@ UnknownScript_0x19b0de: iffalse UnknownScript_0x19b124 writetext UnknownText_0x19b244 closetext - special Function741d + special Special_DaisyMassage if_equal 0, UnknownScript_0x19b124 if_equal 1, UnknownScript_0x19b12a setflag ENGINE_TEA_IN_BLUES_HOUSE diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm index ef9bbbfcd..04a6cc907 100644 --- a/maps/RadioTower1F.asm +++ b/maps/RadioTower1F.asm @@ -26,10 +26,10 @@ GentlemanScript_0x5cd3d: loadfont writetext UnknownText_0x5ceba keeptextopen - special Functionc434 - iffalse UnknownScript_0x5cd4c - special Functionc422 -UnknownScript_0x5cd4c: + special Special_CheckLuckyNumberShowFlag + iffalse .skip + special Special_ResetLuckyNumberShowFlag +.skip: special Function4d9d3 checkflag ENGINE_LUCKY_NUMBER_SHOW iftrue .GameOver @@ -45,7 +45,7 @@ UnknownScript_0x5cd4c: playsound SFX_DEX_FANFARE_20_49 waitbutton keeptextopen - special Function4d87a + special Special_CheckForLuckyNumberWinners loadmovesprites applymovement $6, MovementData_0x5ce74 loadfont @@ -66,7 +66,7 @@ UnknownScript_0x5cd4c: waitbutton keeptextopen giveitem MASTER_BALL, 1 - iffalse UnknownScript_0x5cdcf + iffalse .BagFull itemnotify setflag ENGINE_LUCKY_NUMBER_SHOW jump .GameOver @@ -77,7 +77,7 @@ UnknownScript_0x5cd4c: waitbutton keeptextopen giveitem EXP_SHARE, 1 - iffalse UnknownScript_0x5cdcf + iffalse .BagFull itemnotify setflag ENGINE_LUCKY_NUMBER_SHOW jump .GameOver @@ -88,7 +88,7 @@ UnknownScript_0x5cd4c: waitbutton keeptextopen giveitem PP_UP, 1 - iffalse UnknownScript_0x5cdcf + iffalse .BagFull itemnotify setflag ENGINE_LUCKY_NUMBER_SHOW jump .GameOver @@ -99,7 +99,7 @@ UnknownScript_0x5cd4c: loadmovesprites end -UnknownScript_0x5cdcf: +.BagFull: writetext UnknownText_0x5d0e6 closetext loadmovesprites diff --git a/maps/UndergroundWarehouse.asm b/maps/UndergroundWarehouse.asm index ba91e8684..bdc5d9bce 100644 --- a/maps/UndergroundWarehouse.asm +++ b/maps/UndergroundWarehouse.asm @@ -7,9 +7,9 @@ UndergroundWarehouse_MapScriptHeader: ; callbacks - dbw 5, UnknownScript_0x7d950 + dbw 5, .ResetSwitches -UnknownScript_0x7d950: +.ResetSwitches: clearevent EVENT_SWITCH_1 clearevent EVENT_SWITCH_2 clearevent EVENT_SWITCH_3 diff --git a/maps/WarehouseEntrance.asm b/maps/WarehouseEntrance.asm index 28416d159..7d30179da 100644 --- a/maps/WarehouseEntrance.asm +++ b/maps/WarehouseEntrance.asm @@ -194,7 +194,7 @@ OlderHaircutBrotherScript: if_equal $2, .NotEnoughMoney writetext UnknownText_0x7c69a keeptextopen - special Function7413 + special Special_YoungerHaircutBrother if_equal $0, .Refused if_equal $1, .Refused setflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT @@ -277,7 +277,7 @@ YoungerHaircutBrotherScript: if_equal $2, .NotEnoughMoney writetext UnknownText_0x7c7f1 keeptextopen - special Function7418 + special Special_OlderHaircutBrother if_equal $0, .Refused if_equal $1, .Refused setflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT @@ -342,21 +342,21 @@ YoungerHaircutBrotherScript: end UnknownScript_0x7c2bb: - writetext UnknownText_0x7c8bf + writetext HaircutBrosText_SlightlyHappier special Functionc472 closetext loadmovesprites end UnknownScript_0x7c2c4: - writetext UnknownText_0x7c8dc + writetext HaircutBrosText_Happier special Functionc472 closetext loadmovesprites end UnknownScript_0x7c2cd: - writetext UnknownText_0x7c8ee + writetext HaircutBrosText_MuchHappier special Functionc472 closetext loadmovesprites @@ -615,19 +615,19 @@ UnknownText_0x7c87b: line "done for today." done -UnknownText_0x7c8bf: +HaircutBrosText_SlightlyHappier: text_from_ram StringBuffer3 text " looks a" line "little happier." done -UnknownText_0x7c8dc: +HaircutBrosText_Happier: text_from_ram StringBuffer3 text " looks" line "happy." done -UnknownText_0x7c8ee: +HaircutBrosText_MuchHappier: text_from_ram StringBuffer3 text " looks" line "delighted!" |