diff options
| -rw-r--r-- | audio/music/music_labels.txt | 103 | ||||
| -rw-r--r-- | audio/music_pointers.asm | 10 | ||||
| -rw-r--r-- | battle/core.asm | 2 | ||||
| -rw-r--r-- | constants/item_constants.asm | 16 | ||||
| -rw-r--r-- | constants/trainer_constants.asm | 37 | ||||
| -rwxr-xr-x | engine/npctrade.asm | 2 | ||||
| -rw-r--r-- | engine/pack.asm | 2 | ||||
| -rwxr-xr-x | engine/startmenu.asm | 2 | ||||
| -rwxr-xr-x | engine/tmhm2.asm | 2 | ||||
| -rwxr-xr-x | event/daycare.asm | 2 | ||||
| -rw-r--r-- | maps/FightingDojo.asm | 16 | ||||
| -rw-r--r-- | maps/RadioTower1F.asm | 2 | ||||
| -rw-r--r-- | maps/RadioTower2F.asm | 8 | ||||
| -rw-r--r-- | maps/RadioTower3F.asm | 6 | ||||
| -rw-r--r-- | maps/RadioTower4F.asm | 4 | ||||
| -rw-r--r-- | maps/Route24.asm | 2 | ||||
| -rw-r--r-- | maps/SlowpokeWellB1F.asm | 8 | ||||
| -rw-r--r-- | maps/TeamRocketBaseB1F.asm | 6 | ||||
| -rw-r--r-- | maps/TeamRocketBaseB2F.asm | 6 | ||||
| -rw-r--r-- | maps/TeamRocketBaseB3F.asm | 4 | ||||
| -rw-r--r-- | maps/UndergroundPathSwitchRoomEntrances.asm | 8 | ||||
| -rw-r--r-- | maps/UndergroundWarehouse.asm | 6 | ||||
| -rwxr-xr-x | misc/mobile_12_2.asm | 2 |
23 files changed, 91 insertions, 165 deletions
diff --git a/audio/music/music_labels.txt b/audio/music/music_labels.txt deleted file mode 100644 index f22ed7d9c..000000000 --- a/audio/music/music_labels.txt +++ /dev/null @@ -1,103 +0,0 @@ -Music_Nothing -Music_TitleScreen -Music_Route1 -Music_Route3 -Music_Route12 -Music_MagnetTrain -Music_KantoGymLeaderBattle -Music_KantoTrainerBattle -Music_KantoWildPokemonBattle -Music_PokemonCenter -Music_LookHiker -Music_LookLass -Music_LookOfficer -Music_HealPokemon -Music_LavenderTown -Music_Route2 -Music_MtMoon -Music_ShowMeAround -Music_GameCorner -Music_Bicycle -Music_HallOfFame -Music_ViridianCity -Music_CeladonCity -Music_TrainerVictory -Music_WildPokemonVictory -Music_GymLeaderVictory -Music_MtMoonSquare -Music_Gym -Music_PalletTown -Music_ProfOaksPokemonTalk -Music_ProfOak -Music_LookRival -Music_AfterTheRivalFight -Music_Surf -Music_Evolution -Music_NationalPark -Music_Credits -Music_AzaleaTown -Music_CherrygroveCity -Music_LookKimonoGirl -Music_UnionCave -Music_JohtoWildPokemonBattle -Music_JohtoTrainerBatle -Music_Route30 -Music_EcruteakCity -Music_VioletCity -Music_JohtoGymLeaderBattle -Music_ChampionBattle -Music_RivalBattle -Music_RocketBattle -Music_ElmsLab -Music_DarkCave -Music_Route29 -Music_Route36 -Music_SSAqua -Music_LookYoungster -Music_LookBeauty -Music_LookRocket -Music_LookPokemaniac -Music_LookSage -Music_NewBarkTown -Music_GoldenrodCity -Music_VermilionCity -Music_PokemonChannel -Music_PokeFluteChannel -Music_TinTower -Music_SproutTower -Music_BurnedTower -Music_Lighthouse -Music_LakeOfRage -Music_IndigoPlateau -Music_Route37 -Music_RocketHideout -Music_DragonsDen -Music_JohtoWildPokemonBattleNight -Music_RuinsOfAlphRadioSignal -Music_SuccessfulCapture -Music_Route26 -Music_Mom -Music_VictoryRoad -Music_PokemonLullaby -Music_PokemonMarch -Music_GoldSilverOpening -Music_GoldSilverOpening2 -Music_MainMenu -Music_RuinsOfAlphInterior -Music_RocketTheme -Music_DancingHall -Music_BugCatchingContestResults -Music_BugCatchingContest -Music_LakeOfRageRocketsRadioSignal -Music_Printer -Music_PostCredits -Music_Clair -Music_MobileAdapterMenu -Music_MobileAdapter -Music_BuenasPassword -Music_LookMysticalMan -Music_CrystalOpening -Music_BattleTowerTheme -Music_SuicuneBattle -Music_BattleTowerLobby -Music_MobileCenter diff --git a/audio/music_pointers.asm b/audio/music_pointers.asm index 7e0ca0c69..5bc3b44be 100644 --- a/audio/music_pointers.asm +++ b/audio/music_pointers.asm @@ -1,12 +1,4 @@ -; See song sections in main.asm: -; Songs i -; Songs ii -; Songs iii -; Songs I -; Songs II -; Songs III -; Songs IV -; Songs V +; See song sections in audio.asm. ; e906e dba Music_Nothing ; 0xe91a3 diff --git a/battle/core.asm b/battle/core.asm index 9b644ca5b..1bffd407e 100644 --- a/battle/core.asm +++ b/battle/core.asm @@ -2995,7 +2995,7 @@ SelectBattleMon: ; 3d329 PickPartyMonInBattle: ; 3d33c .loop - ld a, $2 ; Which PKMN? + ld a, PARTYMENUACTION_SWITCH ; Which PKMN? ld [PartyMenuActionText], a call JumpToPartyMenuAndPrintText call SelectBattleMon diff --git a/constants/item_constants.asm b/constants/item_constants.asm index 71cc2ba60..76eaba5ca 100644 --- a/constants/item_constants.asm +++ b/constants/item_constants.asm @@ -416,16 +416,16 @@ ITEMMENU_CLOSE EQU 6 ; PartyMenuActionText const_def - const PARTYMENUACTION_00 + const PARTYMENUACTION_CHOOSE_POKEMON const PARTYMENUACTION_HEALING_ITEM - const PARTYMENUACTION_02 - const PARTYMENUACTION_TEACH_TM - const PARTYMENUACTION_04 + const PARTYMENUACTION_SWITCH + const PARTYMENUACTION_TEACH_TMHM + const PARTYMENUACTION_MOVE const PARTYMENUACTION_EVO_STONE - const PARTYMENUACTION_06 - const PARTYMENUACTION_07 - const PARTYMENUACTION_08 - const PARTYMENUACTION_MOBILE + const PARTYMENUACTION_GIVE_MON + const PARTYMENUACTION_GIVE_MON_FEMALE ; unused + const PARTYMENUACTION_GIVE_ITEM + const PARTYMENUACTION_MOBILE ; mobile const_value set $f0 const PARTYMENUTEXT_HEAL_PSN diff --git a/constants/trainer_constants.asm b/constants/trainer_constants.asm index 74b1e341d..70692c822 100644 --- a/constants/trainer_constants.asm +++ b/constants/trainer_constants.asm @@ -241,6 +241,37 @@ KRIS EQU __enum__ const MILLER trainerclass GRUNTM ; 1f + const GRUNTM_1 + const GRUNTM_2 + const GRUNTM_3 + const GRUNTM_4 + const GRUNTM_5 + const GRUNTM_6 + const GRUNTM_7 + const GRUNTM_8 + const GRUNTM_9 + const GRUNTM_10 + const GRUNTM_11 + const GRUNTM_12 + const GRUNTM_13 + const GRUNTM_14 + const GRUNTM_15 + const GRUNTM_16 + const GRUNTM_17 + const GRUNTM_18 + const GRUNTM_19 + const GRUNTM_20 + const GRUNTM_21 + const GRUNTM_22 + const GRUNTM_23 + const GRUNTM_24 + const GRUNTM_25 + const GRUNTM_26 + const GRUNTM_27 + const GRUNTM_28 + const GRUNTM_29 + const GRUNTM_30 + const GRUNTM_31 trainerclass GENTLEMAN ; 20 const PRESTON @@ -611,6 +642,12 @@ KRIS EQU __enum__ const DIRK trainerclass GRUNTF ; 42 + const GRUNTF_1 + const GRUNTF_2 + const GRUNTF_3 + const GRUNTF_4 + const GRUNTF_5 + trainerclass MYSTICALMAN ; 43 const EUSINE diff --git a/engine/npctrade.asm b/engine/npctrade.asm index f28734ea9..01631d051 100755 --- a/engine/npctrade.asm +++ b/engine/npctrade.asm @@ -39,7 +39,7 @@ NPCTrade:: ; fcba8 jr c, .done ; Select givemon from party - ld b, 6 + ld b, PARTYMENUACTION_GIVE_MON callba SelectTradeOrDaycareMon ld a, TRADE_CANCEL jr c, .done diff --git a/engine/pack.asm b/engine/pack.asm index 8a63d22e5..dad9a799d 100644 --- a/engine/pack.asm +++ b/engine/pack.asm @@ -603,7 +603,7 @@ GiveItem: ; 103fd push af res NO_TEXT_SCROLL, a ld [Options], a - ld a, $8 + ld a, PARTYMENUACTION_GIVE_ITEM ld [PartyMenuActionText], a call ClearBGPalettes callba LoadPartyMenuGFX diff --git a/engine/startmenu.asm b/engine/startmenu.asm index a935b8a07..32999cacb 100755 --- a/engine/startmenu.asm +++ b/engine/startmenu.asm @@ -745,7 +745,7 @@ SwitchPartyMons: ; 12aec callba HoldSwitchmonIcon callba InitPartyMenuNoCancel - ld a, 4 + ld a, PARTYMENUACTION_MOVE ld [PartyMenuActionText], a callba WritePartyMenuTilemap callba PrintPartyMenuText diff --git a/engine/tmhm2.asm b/engine/tmhm2.asm index 6e32fdae8..8d19aaf81 100755 --- a/engine/tmhm2.asm +++ b/engine/tmhm2.asm @@ -80,7 +80,7 @@ ChooseMonToLearnTMHM_NoRefresh: ; 2c80a callba LoadPartyMenuGFX callba InitPartyMenuWithCancel callba InitPartyMenuGFX - ld a, $3 ; TeachWhichPKMNString + ld a, PARTYMENUACTION_TEACH_TMHM ld [PartyMenuActionText], a .loopback callba WritePartyMenuTilemap diff --git a/event/daycare.asm b/event/daycare.asm index a6d8842a9..b521deeff 100755 --- a/event/daycare.asm +++ b/event/daycare.asm @@ -123,7 +123,7 @@ DayCareAskDepositPokemon: ; 16798 jr c, .OnlyOneMon ld a, DAYCARETEXT_WHICH_ONE call PrintDayCareText - ld b, 6 + ld b, PARTYMENUACTION_GIVE_MON callba SelectTradeOrDaycareMon jr c, .Declined ld a, [CurPartySpecies] diff --git a/maps/FightingDojo.asm b/maps/FightingDojo.asm index 3032519aa..dc6a99a99 100644 --- a/maps/FightingDojo.asm +++ b/maps/FightingDojo.asm @@ -9,19 +9,19 @@ FightingDojo_MapScriptHeader: .MapCallbacks: db 0 -BlackBeltScript_0x189b61: - jumptextfaceplayer UnknownText_0x189b6c +FightingDojoBlackBelt: + jumptextfaceplayer FightingDojoBlackBeltText MapFightingDojoSignpost0Script: - jumptext UnknownText_0x189bc0 + jumptext FightingDojoSign0Text MapFightingDojoSignpost1Script: - jumptext UnknownText_0x189be0 + jumptext FightingDojoSign1Text FightingDojoFocusBand: itemball FOCUS_BAND -UnknownText_0x189b6c: +FightingDojoBlackBeltText: text "Hello!" para "KARATE KING, the" @@ -32,12 +32,12 @@ UnknownText_0x189b6c: cont "training." done -UnknownText_0x189bc0: +FightingDojoSign0Text: text "What goes around" line "comes around!" done -UnknownText_0x189be0: +FightingDojoSign1Text: text "Enemies on every" line "side!" done @@ -61,5 +61,5 @@ FightingDojo_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_BLACK_BELT, 4, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x189b61, -1 + person_event SPRITE_BLACK_BELT, 4, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, FightingDojoBlackBelt, -1 person_event SPRITE_POKE_BALL, 1, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, FightingDojoFocusBand, EVENT_PICKED_UP_FOCUS_BAND diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm index a2ecaed91..4e670be07 100644 --- a/maps/RadioTower1F.asm +++ b/maps/RadioTower1F.asm @@ -186,7 +186,7 @@ YoungsterScript_0x5ce54: jumptextfaceplayer UnknownText_0x5d4ac TrainerGruntM3: - trainer EVENT_BEAT_ROCKET_GRUNTM_3, GRUNTM, 3, GruntM3SeenText, GruntM3BeatenText, 0, GruntM3Script + trainer EVENT_BEAT_ROCKET_GRUNTM_3, GRUNTM, GRUNTM_3, GruntM3SeenText, GruntM3BeatenText, 0, GruntM3Script GruntM3Script: end_if_just_battled diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm index 658f64aa4..5925532e9 100644 --- a/maps/RadioTower2F.asm +++ b/maps/RadioTower2F.asm @@ -55,7 +55,7 @@ BlackBeltScript_0x5d722: jumptextfaceplayer UnknownText_0x5da44 TrainerGruntM4: - trainer EVENT_BEAT_ROCKET_GRUNTM_4, GRUNTM, 4, GruntM4SeenText, GruntM4BeatenText, 0, GruntM4Script + trainer EVENT_BEAT_ROCKET_GRUNTM_4, GRUNTM, GRUNTM_4, GruntM4SeenText, GruntM4BeatenText, 0, GruntM4Script GruntM4Script: end_if_just_battled @@ -66,7 +66,7 @@ GruntM4Script: end TrainerGruntM5: - trainer EVENT_BEAT_ROCKET_GRUNTM_5, GRUNTM, 5, GruntM5SeenText, GruntM5BeatenText, 0, GruntM5Script + trainer EVENT_BEAT_ROCKET_GRUNTM_5, GRUNTM, GRUNTM_5, GruntM5SeenText, GruntM5BeatenText, 0, GruntM5Script GruntM5Script: end_if_just_battled @@ -77,7 +77,7 @@ GruntM5Script: end TrainerGruntM6: - trainer EVENT_BEAT_ROCKET_GRUNTM_6, GRUNTM, 6, GruntM6SeenText, GruntM6BeatenText, 0, GruntM6Script + trainer EVENT_BEAT_ROCKET_GRUNTM_6, GRUNTM, GRUNTM_6, GruntM6SeenText, GruntM6BeatenText, 0, GruntM6Script GruntM6Script: end_if_just_battled @@ -88,7 +88,7 @@ GruntM6Script: end TrainerGruntF2: - trainer EVENT_BEAT_ROCKET_GRUNTF_2, GRUNTF, 2, GruntF2SeenText, GruntF2BeatenText, 0, GruntF2Script + trainer EVENT_BEAT_ROCKET_GRUNTF_2, GRUNTF, GRUNTF_2, GruntF2SeenText, GruntF2BeatenText, 0, GruntF2Script GruntF2Script: end_if_just_battled diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm index 5fe5e65a4..166950d44 100644 --- a/maps/RadioTower3F.asm +++ b/maps/RadioTower3F.asm @@ -86,7 +86,7 @@ UnknownScript_0x5e5a1: end TrainerGruntM7: - trainer EVENT_BEAT_ROCKET_GRUNTM_7, GRUNTM, 7, GruntM7SeenText, GruntM7BeatenText, 0, GruntM7Script + trainer EVENT_BEAT_ROCKET_GRUNTM_7, GRUNTM, GRUNTM_7, GruntM7SeenText, GruntM7BeatenText, 0, GruntM7Script GruntM7Script: end_if_just_battled @@ -97,7 +97,7 @@ GruntM7Script: end TrainerGruntM8: - trainer EVENT_BEAT_ROCKET_GRUNTM_8, GRUNTM, 8, GruntM8SeenText, GruntM8BeatenText, 0, GruntM8Script + trainer EVENT_BEAT_ROCKET_GRUNTM_8, GRUNTM, GRUNTM_8, GruntM8SeenText, GruntM8BeatenText, 0, GruntM8Script GruntM8Script: end_if_just_battled @@ -108,7 +108,7 @@ GruntM8Script: end TrainerGruntM9: - trainer EVENT_BEAT_ROCKET_GRUNTM_9, GRUNTM, 9, GruntM9SeenText, GruntM9BeatenText, 0, GruntM9Script + trainer EVENT_BEAT_ROCKET_GRUNTM_9, GRUNTM, GRUNTM_9, GruntM9SeenText, GruntM9BeatenText, 0, GruntM9Script GruntM9Script: end_if_just_battled diff --git a/maps/RadioTower4F.asm b/maps/RadioTower4F.asm index 4fdcf7d2d..837858d69 100644 --- a/maps/RadioTower4F.asm +++ b/maps/RadioTower4F.asm @@ -56,7 +56,7 @@ RadioTowerMeowth: end TrainerGruntM10: - trainer EVENT_BEAT_ROCKET_GRUNTM_10, GRUNTM, 10, GruntM10SeenText, GruntM10BeatenText, 0, GruntM10Script + trainer EVENT_BEAT_ROCKET_GRUNTM_10, GRUNTM, GRUNTM_10, GruntM10SeenText, GruntM10BeatenText, 0, GruntM10Script GruntM10Script: end_if_just_battled @@ -78,7 +78,7 @@ Executivem2Script: end TrainerGruntF4: - trainer EVENT_BEAT_ROCKET_GRUNTF_4, GRUNTF, 4, GruntF4SeenText, GruntF4BeatenText, 0, GruntF4Script + trainer EVENT_BEAT_ROCKET_GRUNTF_4, GRUNTF, GRUNTF_4, GruntF4SeenText, GruntF4BeatenText, 0, GruntF4Script GruntF4Script: end_if_just_battled diff --git a/maps/Route24.asm b/maps/Route24.asm index ef8570fe2..365d347e5 100644 --- a/maps/Route24.asm +++ b/maps/Route24.asm @@ -16,7 +16,7 @@ RocketScript_0x1adbfa: waitbutton closetext winlosstext UnknownText_0x1add67, -1 - loadtrainer GRUNTM, 31 + loadtrainer GRUNTM, GRUNTM_31 startbattle dontrestartmapmusic reloadmapafterbattle diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm index b7bc61906..5714d6340 100644 --- a/maps/SlowpokeWellB1F.asm +++ b/maps/SlowpokeWellB1F.asm @@ -20,7 +20,7 @@ KurtScript_0x5a5d5: jumptextfaceplayer UnknownText_0x5a6b5 TrainerGruntM29: - trainer EVENT_BEAT_ROCKET_GRUNTM_29, GRUNTM, 29, GruntM29SeenText, GruntM29BeatenText, 0, GruntM29Script + trainer EVENT_BEAT_ROCKET_GRUNTM_29, GRUNTM, GRUNTM_29, GruntM29SeenText, GruntM29BeatenText, 0, GruntM29Script GruntM29Script: end_if_just_battled @@ -31,7 +31,7 @@ GruntM29Script: end TrainerGruntM1: - trainer EVENT_BEAT_ROCKET_GRUNTM_1, GRUNTM, 1, GruntM1SeenText, GruntM1BeatenText, 0, GruntM1Script + trainer EVENT_BEAT_ROCKET_GRUNTM_1, GRUNTM, GRUNTM_1, GruntM1SeenText, GruntM1BeatenText, 0, GruntM1Script GruntM1Script: opentext @@ -74,7 +74,7 @@ GruntM1Script: end TrainerGruntM2: - trainer EVENT_BEAT_ROCKET_GRUNTM_2, GRUNTM, 2, GruntM2SeenText, GruntM2BeatenText, 0, GruntM2Script + trainer EVENT_BEAT_ROCKET_GRUNTM_2, GRUNTM, GRUNTM_2, GruntM2SeenText, GruntM2BeatenText, 0, GruntM2Script GruntM2Script: end_if_just_battled @@ -85,7 +85,7 @@ GruntM2Script: end TrainerGruntF1: - trainer EVENT_BEAT_ROCKET_GRUNTF_1, GRUNTF, 1, GruntF1SeenText, GruntF1BeatenText, 0, GruntF1Script + trainer EVENT_BEAT_ROCKET_GRUNTF_1, GRUNTF, GRUNTF_1, GruntF1SeenText, GruntF1BeatenText, 0, GruntF1Script GruntF1Script: end_if_just_battled diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index fad534c8b..a4fff5e88 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -243,7 +243,7 @@ TrainerCameraGrunt1: closetext winlosstext CameraGrunt1BeatenText, 0 setlasttalked TEAMROCKETBASEB1F_ROCKET1 - loadtrainer GRUNTM, 20 + loadtrainer GRUNTM, GRUNTM_20 startbattle disappear TEAMROCKETBASEB1F_ROCKET1 reloadmapafterbattle @@ -256,7 +256,7 @@ TrainerCameraGrunt2: closetext winlosstext CameraGrunt2BeatenText, 0 setlasttalked TEAMROCKETBASEB1F_ROCKET1 - loadtrainer GRUNTM, 21 + loadtrainer GRUNTM, GRUNTM_21 startbattle disappear TEAMROCKETBASEB1F_ROCKET1 reloadmapafterbattle @@ -497,7 +497,7 @@ ScientistJedScript: end TrainerGruntM16: - trainer EVENT_BEAT_ROCKET_GRUNTM_16, GRUNTM, 16, GruntM16SeenText, GruntM16BeatenText, 0, GruntM16Script + trainer EVENT_BEAT_ROCKET_GRUNTM_16, GRUNTM, GRUNTM_16, GruntM16SeenText, GruntM16BeatenText, 0, GruntM16Script GruntM16Script: end_if_just_battled diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index 25994fc92..26adc801b 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -194,7 +194,7 @@ UnknownScript_0x6d0be: end TrainerGruntM17: - trainer EVENT_BEAT_ROCKET_GRUNTM_17, GRUNTM, 17, GruntM17SeenText, GruntM17BeatenText, 0, GruntM17Script + trainer EVENT_BEAT_ROCKET_GRUNTM_17, GRUNTM, GRUNTM_17, GruntM17SeenText, GruntM17BeatenText, 0, GruntM17Script GruntM17Script: end_if_just_battled @@ -205,7 +205,7 @@ GruntM17Script: end TrainerGruntM18: - trainer EVENT_BEAT_ROCKET_GRUNTM_18, GRUNTM, 18, GruntM18SeenText, GruntM18BeatenText, 0, GruntM18Script + trainer EVENT_BEAT_ROCKET_GRUNTM_18, GRUNTM, GRUNTM_18, GruntM18SeenText, GruntM18BeatenText, 0, GruntM18Script GruntM18Script: end_if_just_battled @@ -216,7 +216,7 @@ GruntM18Script: end TrainerGruntM19: - trainer EVENT_BEAT_ROCKET_GRUNTM_19, GRUNTM, 19, GruntM19SeenText, GruntM19BeatenText, 0, GruntM19Script + trainer EVENT_BEAT_ROCKET_GRUNTM_19, GRUNTM, GRUNTM_19, GruntM19SeenText, GruntM19BeatenText, 0, GruntM19Script GruntM19Script: end_if_just_battled diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index d3826b94e..990e55608 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -133,7 +133,7 @@ RocketBaseMurkrow: end SlowpokeTailGrunt: - trainer EVENT_BEAT_ROCKET_GRUNTF_5, GRUNTF, 5, GruntF5SeenText, GruntF5BeatenText, 0, GruntF5Script + trainer EVENT_BEAT_ROCKET_GRUNTF_5, GRUNTF, GRUNTF_5, GruntF5SeenText, GruntF5BeatenText, 0, GruntF5Script GruntF5Script: end_if_just_battled @@ -145,7 +145,7 @@ GruntF5Script: end RaticateTailGrunt: - trainer EVENT_BEAT_ROCKET_GRUNTM_28, GRUNTM, 28, GruntM28SeenText, GruntM28BeatenText, 0, GruntM28Script + trainer EVENT_BEAT_ROCKET_GRUNTM_28, GRUNTM, GRUNTM_28, GruntM28SeenText, GruntM28BeatenText, 0, GruntM28Script GruntM28Script: end_if_just_battled diff --git a/maps/UndergroundPathSwitchRoomEntrances.asm b/maps/UndergroundPathSwitchRoomEntrances.asm index 85427ade3..bf4f1f1c9 100644 --- a/maps/UndergroundPathSwitchRoomEntrances.asm +++ b/maps/UndergroundPathSwitchRoomEntrances.asm @@ -211,7 +211,7 @@ UndergroundSilverBattleScript: end TrainerGruntM11: - trainer EVENT_BEAT_ROCKET_GRUNTM_11, GRUNTM, 11, GruntM11SeenText, GruntM11BeatenText, 0, GruntM11Script + trainer EVENT_BEAT_ROCKET_GRUNTM_11, GRUNTM, GRUNTM_11, GruntM11SeenText, GruntM11BeatenText, 0, GruntM11Script GruntM11Script: end_if_just_battled @@ -222,7 +222,7 @@ GruntM11Script: end TrainerGruntM25: - trainer EVENT_BEAT_ROCKET_GRUNTM_25, GRUNTM, 25, GruntM25SeenText, GruntM25BeatenText, 0, GruntM25Script + trainer EVENT_BEAT_ROCKET_GRUNTM_25, GRUNTM, GRUNTM_25, GruntM25SeenText, GruntM25BeatenText, 0, GruntM25Script GruntM25Script: end_if_just_battled @@ -255,7 +255,7 @@ BurglarEddieScript: end TrainerGruntM13: - trainer EVENT_BEAT_ROCKET_GRUNTM_13, GRUNTM, 13, GruntM13SeenText, GruntM13BeatenText, 0, GruntM13Script + trainer EVENT_BEAT_ROCKET_GRUNTM_13, GRUNTM, GRUNTM_13, GruntM13SeenText, GruntM13BeatenText, 0, GruntM13Script GruntM13Script: end_if_just_battled @@ -266,7 +266,7 @@ GruntM13Script: end TrainerGruntF3: - trainer EVENT_BEAT_ROCKET_GRUNTF_3, GRUNTF, 3, GruntF3SeenText, GruntF3BeatenText, 0, GruntF3Script + trainer EVENT_BEAT_ROCKET_GRUNTF_3, GRUNTF, GRUNTF_3, GruntF3SeenText, GruntF3BeatenText, 0, GruntF3Script GruntF3Script: end_if_just_battled diff --git a/maps/UndergroundWarehouse.asm b/maps/UndergroundWarehouse.asm index 32454451c..943a042c1 100644 --- a/maps/UndergroundWarehouse.asm +++ b/maps/UndergroundWarehouse.asm @@ -39,7 +39,7 @@ UndergroundWarehouse_MapScriptHeader: return TrainerGruntM24: - trainer EVENT_BEAT_ROCKET_GRUNTM_24, GRUNTM, 24, GruntM24SeenText, GruntM24BeatenText, 0, GruntM24Script + trainer EVENT_BEAT_ROCKET_GRUNTM_24, GRUNTM, GRUNTM_24, GruntM24SeenText, GruntM24BeatenText, 0, GruntM24Script GruntM24Script: end_if_just_battled @@ -50,7 +50,7 @@ GruntM24Script: end TrainerGruntM14: - trainer EVENT_BEAT_ROCKET_GRUNTM_14, GRUNTM, 14, GruntM14SeenText, GruntM14BeatenText, 0, GruntM14Script + trainer EVENT_BEAT_ROCKET_GRUNTM_14, GRUNTM, GRUNTM_14, GruntM14SeenText, GruntM14BeatenText, 0, GruntM14Script GruntM14Script: end_if_just_battled @@ -61,7 +61,7 @@ GruntM14Script: end TrainerGruntM15: - trainer EVENT_BEAT_ROCKET_GRUNTM_15, GRUNTM, 15, GruntM15SeenText, GruntM15BeatenText, 0, GruntM15Script + trainer EVENT_BEAT_ROCKET_GRUNTM_15, GRUNTM, GRUNTM_15, GruntM15SeenText, GruntM15BeatenText, 0, GruntM15Script GruntM15Script: end_if_just_battled diff --git a/misc/mobile_12_2.asm b/misc/mobile_12_2.asm index 2bdd6ddc3..37179c122 100755 --- a/misc/mobile_12_2.asm +++ b/misc/mobile_12_2.asm @@ -316,7 +316,7 @@ Function4aa25: ; 4aa25 call Function4aad3 Function4aa34: ; 4aa34 - ld a, $9 + ld a, PARTYMENUACTION_MOBILE ld [PartyMenuActionText], a callba WritePartyMenuTilemap xor a |