diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/ChampionsRoom.asm | 2 | ||||
| -rw-r--r-- | scripts/HallOfFame.asm | 4 | ||||
| -rw-r--r-- | scripts/PokemonTower6F.asm | 2 | ||||
| -rw-r--r-- | scripts/RocketHideoutB2F.asm | 14 | ||||
| -rw-r--r-- | scripts/RocketHideoutB4F.asm | 6 | ||||
| -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 | ||||
| -rw-r--r-- | scripts/VermilionDock.asm | 2 |
10 files changed, 26 insertions, 26 deletions
diff --git a/scripts/ChampionsRoom.asm b/scripts/ChampionsRoom.asm index f244327d..3188a5c0 100644 --- a/scripts/ChampionsRoom.asm +++ b/scripts/ChampionsRoom.asm @@ -6,7 +6,7 @@ ChampionsRoom_Script: ret ResetRivalScript: - xor a ; SCENE_CHAMPIONSROOM_DEFAULT + xor a ; SCRIPT_CHAMPIONSROOM_DEFAULT ld [wJoyIgnore], a ld [wChampionsRoomCurScript], a ret diff --git a/scripts/HallOfFame.asm b/scripts/HallOfFame.asm index ed3d2a73..c6ecf4ec 100644 --- a/scripts/HallOfFame.asm +++ b/scripts/HallOfFame.asm @@ -31,9 +31,9 @@ HallOfFameResetEventsAndSaveScript: ld [wLetterPrintingDelayFlags], a ld hl, wStatusFlags7 res BIT_NO_MAP_MUSIC, [hl] - assert wStatusFlags7 + 1 == wElite4Flags + ASSERT wStatusFlags7 + 1 == wElite4Flags inc hl - set BIT_UNUSED_BEAT_ELITE_4, [hl] ; debug, unused? + set BIT_UNUSED_BEAT_ELITE_4, [hl] ; unused xor a ; SCRIPT_*_DEFAULT ld hl, wLoreleisRoomCurScript ld [hli], a ; wLoreleisRoomCurScript 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 2365ff70..bfd4a835 100644 --- a/scripts/RocketHideoutB4F.asm +++ b/scripts/RocketHideoutB4F.asm @@ -391,11 +391,11 @@ RocketHideoutB4FRocketText: jp TextScriptEnd RocketHideoutB4FRocketBattleText: - text_far _RocketHideoutB4FRocket2BattleText + text_far _RocketHideoutB4FRocketBattleText text_end RocketHideoutB4FRocketEndBattleText: - text_far _RocketHideoutB4FRocket2EndBattleText + text_far _RocketHideoutB4FRocketEndBattleText text_promptbutton text_asm SetEvent EVENT_ROCKET_DROPPED_LIFT_KEY @@ -411,5 +411,5 @@ RocketHideoutB4FRocketAfterBattleText: jp TextScriptEnd .Text: - text_far _RocketHideoutB4FRocket2AfterBattleText + text_far _RocketHideoutB4FRocketAfterBattleText 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 e0bf102f..f1532448 100644 --- a/scripts/SilphCo7F.asm +++ b/scripts/SilphCo7F.asm @@ -296,7 +296,7 @@ SilphCo7FSilphWorkerM1Text: lb bc, LAPRAS, 15 call GivePokemon jr nc, .done - ld a, [wSimulatedJoypadStatesEnd] + ld a, [wAddedToParty] and a call z, WaitForTextScrollButtonPress call EnableAutoTextBoxDrawing diff --git a/scripts/VermilionDock.asm b/scripts/VermilionDock.asm index 22312510..1de518e3 100644 --- a/scripts/VermilionDock.asm +++ b/scripts/VermilionDock.asm @@ -62,7 +62,7 @@ VermilionDockSSAnneLeavesScript: ldh [hAutoBGTransferEnabled], a ld [wSSAnneSmokeDriftAmount], a ldh [rOBP1], a - call UpdateGBCPal_OBP1 + call UpdateCGBPal_OBP1 ld a, 88 ld [wSSAnneSmokeX], a ld hl, wMapViewVRAMPointer |