diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/ChampionsRoom.asm | 2 | ||||
| -rw-r--r-- | scripts/PokemonTower6F.asm | 2 | ||||
| -rw-r--r-- | scripts/RocketHideoutB2F.asm | 14 | ||||
| -rw-r--r-- | scripts/RocketHideoutB4F.asm | 42 | ||||
| -rw-r--r-- | scripts/RocketHideoutElevator.asm | 4 | ||||
| -rw-r--r-- | scripts/Route8.asm | 6 | ||||
| -rw-r--r-- | scripts/SilphCo6F.asm | 10 | ||||
| -rw-r--r-- | scripts/SilphCo7F.asm | 2 |
8 files changed, 41 insertions, 41 deletions
diff --git a/scripts/ChampionsRoom.asm b/scripts/ChampionsRoom.asm index 46814138..4d8a218b 100644 --- a/scripts/ChampionsRoom.asm +++ b/scripts/ChampionsRoom.asm @@ -5,7 +5,7 @@ ChampionsRoom_Script: jp CallFunctionInTable ResetRivalScript: - xor a ; SCENE_CHAMPIONSROOM_DEFAULT + xor a ; SCRIPT_CHAMPIONSROOM_DEFAULT ld [wJoyIgnore], a ld [wChampionsRoomCurScript], a ret diff --git a/scripts/PokemonTower6F.asm b/scripts/PokemonTower6F.asm index cf246c56..251b3759 100644 --- a/scripts/PokemonTower6F.asm +++ b/scripts/PokemonTower6F.asm @@ -74,7 +74,7 @@ PokemonTower6FMarowakBattleScript: .did_not_defeat ld a, $1 ld [wSimulatedJoypadStatesIndex], a - ld a, $10 + ld a, D_RIGHT ld [wSimulatedJoypadStatesEnd], a xor a ld [wSpritePlayerStateData2MovementByte1], a diff --git a/scripts/RocketHideoutB2F.asm b/scripts/RocketHideoutB2F.asm index 7a5c2e4a..0df2f06a 100644 --- a/scripts/RocketHideoutB2F.asm +++ b/scripts/RocketHideoutB2F.asm @@ -281,7 +281,7 @@ RocketHideoutB2F_TextPointers: RocketHideout2TrainerHeaders: def_trainers RocketHideout2TrainerHeader0: - trainer EVENT_BEAT_ROCKET_HIDEOUT_2_TRAINER_0, 4, RocketHideoutB1FRocketBattleText, RocketHideoutB1FRocketEndBattleText, RocketHideoutB1FRocketAfterBattleText + trainer EVENT_BEAT_ROCKET_HIDEOUT_2_TRAINER_0, 4, RocketHideoutB2FRocketBattleText, RocketHideoutB2FRocketEndBattleText, RocketHideoutB2FRocketAfterBattleText db -1 ; end RocketHideoutB2FRocketText: @@ -290,14 +290,14 @@ RocketHideoutB2FRocketText: call TalkToTrainer jp TextScriptEnd -RocketHideoutB1FRocketBattleText: - text_far _RocketHideoutB1FRocketBattleText +RocketHideoutB2FRocketBattleText: + text_far _RocketHideoutB2FRocketBattleText text_end -RocketHideoutB1FRocketEndBattleText: - text_far _RocketHideoutB1FRocketEndBattleText +RocketHideoutB2FRocketEndBattleText: + text_far _RocketHideoutB2FRocketEndBattleText text_end -RocketHideoutB1FRocketAfterBattleText: - text_far _RocketHideoutB1FRocketAfterBattleText +RocketHideoutB2FRocketAfterBattleText: + text_far _RocketHideoutB2FRocketAfterBattleText text_end diff --git a/scripts/RocketHideoutB4F.asm b/scripts/RocketHideoutB4F.asm index 2c630067..a8445db3 100644 --- a/scripts/RocketHideoutB4F.asm +++ b/scripts/RocketHideoutB4F.asm @@ -89,11 +89,11 @@ RocketHideoutB4F_TextPointers: RocketHideout4TrainerHeaders: def_trainers 2 RocketHideout4TrainerHeader0: - trainer EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_0, 0, RocketHideoutB4FGiovanniBattleText, RocketHideoutB4FGiovanniEndBattleText, RocketHideoutB4FGiovanniAfterBattleText + trainer EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_0, 0, RocketHideoutB4FRocket1BattleText, RocketHideoutB4FRocket1EndBattleText, RocketHideoutB4FRocket1AfterBattleText RocketHideout4TrainerHeader1: - trainer EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_1, 0, RocketHideoutB4FRocket1BattleText, RocketHideoutB4FRocket1EndBattleText, RocketHideoutB4FRocket1AfterBattleText + trainer EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_1, 0, RocketHideoutB4FRocket2BattleText, RocketHideoutB4FRocket2EndBattleText, RocketHideoutB4FRocket2AfterBattleText RocketHideout4TrainerHeader2: - trainer EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2, 1, RocketHideoutB4FRocket2BattleText, RocketHideoutB4FRocket2EndBattleText, RocketHideoutB4FRocket2AfterBattleText + trainer EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2, 1, RocketHideoutB4FRocket3BattleText, RocketHideoutB4FRocket3EndBattleText, RocketHideoutB4FRocket3AfterBattleText db -1 ; end RocketHideoutB4FGiovanniText: @@ -142,16 +142,16 @@ RocketHideoutB4FRocket1Text: call TalkToTrainer jp TextScriptEnd -RocketHideoutB4FGiovanniBattleText: - text_far _RocketHideoutB4FGiovanniBattleText +RocketHideoutB4FRocket1BattleText: + text_far _RocketHideoutB4FRocket1BattleText text_end -RocketHideoutB4FGiovanniEndBattleText: - text_far _RocketHideoutB4FGiovanniEndBattleText +RocketHideoutB4FRocket1EndBattleText: + text_far _RocketHideoutB4FRocket1EndBattleText text_end -RocketHideoutB4FGiovanniAfterBattleText: - text_far _RocketHideoutB4FGiovanniAfterBattleText +RocketHideoutB4FRocket1AfterBattleText: + text_far _RocketHideoutB4FRocket1AfterBattleText text_end RocketHideoutB4FRocket2Text: @@ -160,16 +160,16 @@ RocketHideoutB4FRocket2Text: call TalkToTrainer jp TextScriptEnd -RocketHideoutB4FRocket1BattleText: - text_far _RocketHideoutB4FRocket1BattleText +RocketHideoutB4FRocket2BattleText: + text_far _RocketHideoutB4FRocket2BattleText text_end -RocketHideoutB4FRocket1EndBattleText: - text_far _RocketHideoutB4FRocket1EndBattleText +RocketHideoutB4FRocket2EndBattleText: + text_far _RocketHideoutB4FRocket2EndBattleText text_end -RocketHideoutB4FRocket1AfterBattleText: - text_far _RocketHideoutB4FRocket1AfterBattleText +RocketHideoutB4FRocket2AfterBattleText: + text_far _RocketHideoutB4FRocket2AfterBattleText text_end RocketHideoutB4FRocket3Text: @@ -178,15 +178,15 @@ RocketHideoutB4FRocket3Text: call TalkToTrainer jp TextScriptEnd -RocketHideoutB4FRocket2BattleText: - text_far _RocketHideoutB4FRocket2BattleText +RocketHideoutB4FRocket3BattleText: + text_far _RocketHideoutB4FRocket3BattleText text_end -RocketHideoutB4FRocket2EndBattleText: - text_far _RocketHideoutB4FRocket2EndBattleText +RocketHideoutB4FRocket3EndBattleText: + text_far _RocketHideoutB4FRocket3EndBattleText text_end -RocketHideoutB4FRocket2AfterBattleText: +RocketHideoutB4FRocket3AfterBattleText: text_asm ld hl, .Text call PrintText @@ -199,5 +199,5 @@ RocketHideoutB4FRocket2AfterBattleText: jp TextScriptEnd .Text: - text_far _RocketHideoutB4FRocket2AfterBattleText + text_far _RocketHideoutB4FRocket3AfterBattleText text_end diff --git a/scripts/RocketHideoutElevator.asm b/scripts/RocketHideoutElevator.asm index bd6fb498..d1be4cfb 100644 --- a/scripts/RocketHideoutElevator.asm +++ b/scripts/RocketHideoutElevator.asm @@ -32,7 +32,7 @@ RocketHideoutElevatorStoreWarpEntriesScript: ret RocketHideoutElevatorScript: - ld hl, RocketHideoutElavatorFloors + ld hl, RocketHideoutElevatorFloors call LoadItemList ld hl, RocketHideoutElevatorWarpMaps ld de, wElevatorWarpMaps @@ -40,7 +40,7 @@ RocketHideoutElevatorScript: call CopyData ret -RocketHideoutElavatorFloors: +RocketHideoutElevatorFloors: db 3 ; # db FLOOR_B1F db FLOOR_B2F diff --git a/scripts/Route8.asm b/scripts/Route8.asm index 657d5c83..7b5476c9 100644 --- a/scripts/Route8.asm +++ b/scripts/Route8.asm @@ -35,7 +35,7 @@ Route8TrainerHeader1: Route8TrainerHeader2: trainer EVENT_BEAT_ROUTE_8_TRAINER_2, 4, Route8SuperNerd2BattleText, Route8SuperNerd2EndBattleText, Route8SuperNerd2AfterBattleText Route8TrainerHeader3: - trainer EVENT_BEAT_ROUTE_8_TRAINER_3, 2, Route8CooltrainerF1BattleText, Route8CooltrainerF21EndBattleText, Route8CooltrainerF1AfterBattleText + trainer EVENT_BEAT_ROUTE_8_TRAINER_3, 2, Route8CooltrainerF1BattleText, Route8CooltrainerF1EndBattleText, Route8CooltrainerF1AfterBattleText Route8TrainerHeader4: trainer EVENT_BEAT_ROUTE_8_TRAINER_4, 3, Route8SuperNerd3BattleText, Route8SuperNerd3EndBattleText, Route8SuperNerd3AfterBattleText Route8TrainerHeader5: @@ -112,8 +112,8 @@ Route8CooltrainerF1BattleText: text_far _Route8CooltrainerF1BattleText text_end -Route8CooltrainerF21EndBattleText: - text_far _Route8CooltrainerF21EndBattleText +Route8CooltrainerF1EndBattleText: + text_far _Route8CooltrainerF1EndBattleText text_end Route8CooltrainerF1AfterBattleText: diff --git a/scripts/SilphCo6F.asm b/scripts/SilphCo6F.asm index ad8e83f4..0352f5b4 100644 --- a/scripts/SilphCo6F.asm +++ b/scripts/SilphCo6F.asm @@ -56,7 +56,7 @@ SilphCo6F_TextPointers: SilphCo6TrainerHeaders: def_trainers 6 SilphCo6TrainerHeader0: - trainer EVENT_BEAT_SILPH_CO_6F_TRAINER_0, 2, SilphCo6FRocket1BattleText, SilphCo6Rocket1EndBattleText, SilphCo6Rocket1AfterBattleText + trainer EVENT_BEAT_SILPH_CO_6F_TRAINER_0, 2, SilphCo6FRocket1BattleText, SilphCo6FRocket1EndBattleText, SilphCo6FRocket1AfterBattleText SilphCo6TrainerHeader1: trainer EVENT_BEAT_SILPH_CO_6F_TRAINER_1, 3, SilphCo6FScientistBattleText, SilphCo6FScientistEndBattleText, SilphCo6FScientistAfterBattleText SilphCo6TrainerHeader2: @@ -158,12 +158,12 @@ SilphCo6FRocket1BattleText: text_far _SilphCo6FRocket1BattleText text_end -SilphCo6Rocket1EndBattleText: - text_far _SilphCo6Rocket1EndBattleText +SilphCo6FRocket1EndBattleText: + text_far _SilphCo6FRocket1EndBattleText text_end -SilphCo6Rocket1AfterBattleText: - text_far _SilphCo6Rocket1AfterBattleText +SilphCo6FRocket1AfterBattleText: + text_far _SilphCo6FRocket1AfterBattleText text_end SilphCo6FScientistText: diff --git a/scripts/SilphCo7F.asm b/scripts/SilphCo7F.asm index bf517d29..358be537 100644 --- a/scripts/SilphCo7F.asm +++ b/scripts/SilphCo7F.asm @@ -310,7 +310,7 @@ SilphCo7FSilphWorkerM1Text: lb bc, LAPRAS, 15 call GivePokemon jr nc, .done - ld a, [wSimulatedJoypadStatesEnd] + ld a, [wAddedToParty] and a call z, WaitForTextScrollButtonPress call EnableAutoTextBoxDrawing |