diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm index 735f8299..3619451d 100644 --- a/engine/events/std_scripts.asm +++ b/engine/events/std_scripts.asm @@ -45,13 +45,12 @@ _PokemonBooksScript:: text "ポケモンえほんが　そろってる！" done -_EmptyFridgeScript:: - ld hl, .EmptyFridgeText +_FridgeScript:: + ld hl, .FridgeText call OpenTextbox ret -; Player's empty fridge flavor text -.EmptyFridgeText: +.FridgeText: text "なかは<⋯⋯>" line "ほとんど　からっぽだ<⋯⋯>" done diff --git a/home/std_scripts.asm b/home/std_scripts.asm index da6ff531..baf0eb50 100644 --- a/home/std_scripts.asm +++ b/home/std_scripts.asm @@ -9,8 +9,8 @@ PokemonBooksScript:: farcall _PokemonBooksScript ret -EmptyFridgeScript:: - farcall _EmptyFridgeScript +FridgeScript:: + farcall _FridgeScript ret StoveScript:: diff --git a/macros/maps.asm b/macros/maps.asm index 55855d6c..b80e95f0 100644 --- a/macros/maps.asm +++ b/macros/maps.asm @@ -7,10 +7,6 @@ MACRO object_const_def const_def 2 ENDM -MACRO object_const - const {CURRENT_MAP_ID}_\1 -ENDM - MACRO npc_id db \1 - 2 ENDM @@ -208,7 +204,17 @@ MACRO object_event endc ENDM +MACRO def_script_pointers + const_def +ENDM + +MACRO script_pointer + dw \1, \2 + const \3 +ENDM + MACRO map_generic_scriptloader +{CURRENT_MAP_NAME}_ScriptLoader:: ld hl, {CURRENT_MAP_NAME}ScriptPointers call RunMapScript call WriteBackMapScriptNumber @@ -216,10 +222,10 @@ MACRO map_generic_scriptloader ENDM ; For maps that don't have any scenes. -MACRO map_generic_scriptpointers +MACRO map_generic_script_pointers {CURRENT_MAP_NAME}ScriptPointers:: - dw {CURRENT_MAP_NAME}Script - dw {CURRENT_MAP_NAME}NPCIDs + def_script_pointers + script_pointer {CURRENT_MAP_NAME}Script, {CURRENT_MAP_NAME}NPCIDs, {CURRENT_MAP_ID}_DEFAULT ENDM MACRO map_generic_script @@ -230,7 +236,7 @@ MACRO map_generic_script ret ENDM -MACRO map_generic_npcids +MACRO map_generic_npc_ids {CURRENT_MAP_NAME}NPCIDs:: for x, {_NUM_OBJECT_EVENTS} db x diff --git a/maps.asm b/maps.asm index a3323e43..1e5b77a5 100644 --- a/maps.asm +++ b/maps.asm @@ -30,7 +30,7 @@ INCLUDE "maps/OldCitySchool.asm" SECTION "West Maps", ROMX -INCLUDE "maps/Route2Gate1F.asm" +INCLUDE "maps/Route2Gate1F.asm" ; why is this here? INCLUDE "maps/Route2Gate2F.asm" INCLUDE "maps/WestMart1F.asm" INCLUDE "maps/WestMart2F.asm" @@ -54,7 +54,7 @@ INCLUDE "maps/WestHouse2.asm" SECTION "High-Tech Maps", ROMX -INCLUDE "maps/Route7Gate.asm" ; originally part of Route 5? +INCLUDE "maps/Route7Gate.asm" INCLUDE "maps/HighTechPokecenter1F.asm" INCLUDE "maps/HighTechPokecenter2F.asm" INCLUDE "maps/HighTechLeague1F.asm" diff --git a/maps/OldCityPokecenter2F.asm b/maps/OldCityPokecenter2F.asm index d04779df..b747840e 100644 --- a/maps/OldCityPokecenter2F.asm +++ b/maps/OldCityPokecenter2F.asm @@ -1,10 +1,10 @@ map_attributes OldCityPokecenter2F, OLD_CITY_POKECENTER_2F object_const_def - object_const 2F_TRADE_RECEPTIONIST - object_const 2F_BATTLE_RECEPTIONIST - object_const 2F_GRAMPS - object_const TIME_CAPSULE_RECEPTIONIST + const OLD_CITY_POKECENTER_2F_TRADE_RECEPTIONIST + const OLD_CITY_POKECENTER_2F_BATTLE_RECEPTIONIST + const OLD_CITY_POKECENTER_2F_GRAMPS + const OLD_CITY_POKECENTER_2F_TIME_CAPSULE_RECEPTIONIST OldCityPokecenter2F_MapEvents:: dw $4000 ; unknown @@ -29,10 +29,14 @@ INCBIN "maps/OldCityPokecenter2F.blk" OldCityPokecenter2F_ScriptLoader: call SetBitsForTimeCapsuleRequestIfNotLinked - map_generic_scriptloader - map_generic_scriptpointers + ld hl, OldCityPokecenter2FScriptPointers + call RunMapScript + call WriteBackMapScriptNumber + ret + + map_generic_script_pointers map_generic_script - map_generic_npcids + map_generic_npc_ids OldCityPokecenter2FSignPointers: dw MapDefaultText diff --git a/maps/OldCityPokecenterBattle.asm b/maps/OldCityPokecenterBattle.asm index 0f4df415..8aa4f387 100644 --- a/maps/OldCityPokecenterBattle.asm +++ b/maps/OldCityPokecenterBattle.asm @@ -15,11 +15,10 @@ OldCityPokecenterBattle_MapEvents:: OldCityPokecenterBattle_Blocks:: INCBIN "maps/OldCityPokecenterBattle.blk" -OldCityPokecenterBattle_ScriptLoader: map_generic_scriptloader - map_generic_scriptpointers + map_generic_script_pointers map_generic_script - map_generic_npcids + map_generic_npc_ids OldCityPokecenterBattleSignPointers: dw MapDefaultText diff --git a/maps/OldCityPokecenterTimeMachine.asm b/maps/OldCityPokecenterTimeMachine.asm index 0cf23d7b..bb4bdbcd 100644 --- a/maps/OldCityPokecenterTimeMachine.asm +++ b/maps/OldCityPokecenterTimeMachine.asm @@ -1,4 +1,7 @@ map_attributes OldCityPokecenterTimeMachine, OLD_CITY_POKECENTER_TIME_MACHINE + + object_const_def + const OLD_CITY_POKECENTER_TIME_MACHINE_TIME_CAPSULE_RECEPTIONIST OldCityPokecenterTimeMachine_MapEvents:: dw $4000 ; unknown @@ -18,10 +21,14 @@ INCBIN "maps/OldCityPokecenterTimeMachine.blk" OldCityPokecenterTimeMachine_ScriptLoader: call SetBitsForTimeCapsuleRequestIfNotLinked - map_generic_scriptloader - map_generic_scriptpointers + ld hl, OldCityPokecenterTimeMachineScriptPointers + call RunMapScript + call WriteBackMapScriptNumber + ret + + map_generic_script_pointers map_generic_script - map_generic_npcids + map_generic_npc_ids OldCityPokecenterTimeMachineSignPointers: dw MapDefaultText diff --git a/maps/OldCityPokecenterTrade.asm b/maps/OldCityPokecenterTrade.asm index 02a4d565..db917bd3 100644 --- a/maps/OldCityPokecenterTrade.asm +++ b/maps/OldCityPokecenterTrade.asm @@ -18,11 +18,10 @@ INCBIN "maps/OldCityPokecenterTrade.blk" ; unreferenced ret -OldCityPokecenterTrade_ScriptLoader: map_generic_scriptloader - map_generic_scriptpointers + map_generic_script_pointers map_generic_script - map_generic_npcids + map_generic_npc_ids OldCityPokecenterTradeSignPointers: dw MapDefaultText diff --git a/maps/PlayerHouse1F.asm b/maps/PlayerHouse1F.asm index 20b22d8d..1e0bc5f6 100644 --- a/maps/PlayerHouse1F.asm +++ b/maps/PlayerHouse1F.asm @@ -1,7 +1,7 @@ map_attributes PlayerHouse1F, PLAYER_HOUSE_1F object_const_def - object_const MOM + const PLAYER_HOUSE_1F_MOM PlayerHouse1F_MapEvents:: dw $4000 ; unknown @@ -24,14 +24,12 @@ PlayerHouse1F_MapEvents:: PlayerHouse1F_Blocks:: INCBIN "maps/PlayerHouse1F.blk" -PlayerHouse1F_ScriptLoader:: map_generic_scriptloader PlayerHouse1FScriptPointers:: - dw PlayerHouse1FScript1 - dw PlayerHouse1FNPCIDs1 - dw PlayerHouse1FScript2 - dw PlayerHouse1FNPCIDs2 + def_script_pointers + script_pointer PlayerHouse1FScript1, PlayerHouse1FNPCIDs1, PLAYER_HOUSE_1F_DEFAULT + script_pointer PlayerHouse1FScript2, PlayerHouse1FNPCIDs2, PLAYER_HOUSE_1F_MOM_BACK PlayerHouse1FNPCIDs1: db -1 @@ -55,7 +53,7 @@ PlayerHouse1FScript2: PlayerHouse1FSignPointers: dw StoveScript dw SinkScript - dw EmptyFridgeScript + dw FridgeScript dw TVScript dw PokemonBooksScript PlayerHouse1F_TextPointers:: diff --git a/maps/PlayerHouse2F.asm b/maps/PlayerHouse2F.asm index ff050698..fdf9690d 100644 --- a/maps/PlayerHouse2F.asm +++ b/maps/PlayerHouse2F.asm @@ -1,8 +1,8 @@ map_attributes PlayerHouse2F, PLAYER_HOUSE_2F object_const_def - object_const KEN - object_const POKEDOLL + const PLAYER_HOUSE_2F_KEN + const PLAYER_HOUSE_2F_POKEDOLL PlayerHouse2F_MapEvents:: dw $4000 ; unknown @@ -24,14 +24,12 @@ PlayerHouse2F_MapEvents:: PlayerHouse2F_Blocks:: INCBIN "maps/PlayerHouse2F.blk" -PlayerHouse2F_ScriptLoader:: map_generic_scriptloader PlayerHouse2FScriptPointers:: - dw PlayerHouse2FScript1 - dw PlayerHouse2FNPCIDs1 - dw PlayerHouse2FScript2 - dw PlayerHouse2FNPCIDs2 + def_script_pointers + script_pointer PlayerHouse2FScript1, PlayerHouse2FNPCIDs1, PLAYER_HOUSE_2F_DEFAULT + script_pointer PlayerHouse2FScript2, PlayerHouse2FNPCIDs2, PLAYER_HOUSE_2F_KEN_LEFT PlayerHouse2F_TextPointers:: dw PlayerHouse2FText1 diff --git a/maps/QuietHills.asm b/maps/QuietHills.asm index 198125d5..b1c3eb8e 100644 --- a/maps/QuietHills.asm +++ b/maps/QuietHills.asm @@ -1,12 +1,12 @@ map_attributes QuietHills, QUIET_HILLS object_const_def - object_const ROCKER - object_const TRAINER1 - object_const TRAINER2 - object_const TRAINER3 - object_const TRAINER4 - object_const TRAINER5 + const QUIET_HILLS_ROCKER + const QUIET_HILLS_TRAINER1 + const QUIET_HILLS_TRAINER2 + const QUIET_HILLS_TRAINER3 + const QUIET_HILLS_TRAINER4 + const QUIET_HILLS_TRAINER5 QuietHills_MapEvents:: dw $4000 ; unknown @@ -38,10 +38,9 @@ QuietHills_MapEvents:: QuietHills_Blocks:: INCBIN "maps/QuietHills.blk" -QuietHills_ScriptLoader:: map_generic_scriptloader - map_generic_scriptpointers - map_generic_npcids + map_generic_script_pointers + map_generic_npc_ids QuietHillsSignPointers: dw QuietHillsSignpost1 diff --git a/maps/RivalHouse.asm b/maps/RivalHouse.asm index c973bd98..c83a4c30 100644 --- a/maps/RivalHouse.asm +++ b/maps/RivalHouse.asm @@ -1,4 +1,8 @@ map_attributes RivalHouse, RIVAL_HOUSE + + object_const_def + const RIVAL_HOUSE_RIVALS_SISTER + const RIVAL_HOUSE_KEN RivalHouse_MapEvents:: dw $4000 ; unknown @@ -22,16 +26,13 @@ RivalHouse_MapEvents:: RivalHouse_Blocks:: INCBIN "maps/RivalHouse.blk" -RivalHouse_ScriptLoader:: map_generic_scriptloader RivalHouseScriptPointers:: - dw RivalHouseScript1 - dw RivalHouseNPCIDs1 - dw RivalHouseScript2 - dw RivalHouseNPCIDs2 - dw RivalHouseScript3 - dw RivalHouseNPCIDs1 + def_script_pointers + script_pointer RivalHouseScript1, RivalHouseNPCIDs1, RIVAL_HOUSE_DEFAULT + script_pointer RivalHouseScript2, RivalHouseNPCIDs2, RIVAL_HOUSE_KEN_HERE + script_pointer RivalHouseScript3, RivalHouseNPCIDs1, RIVAL_HOUSE_GOT_MAP_CARD RivalHouseScript1: ld hl, RivalHouseNPCIDs1 diff --git a/maps/Route1.asm b/maps/Route1.asm index a3cebc0d..14dcae97 100644 --- a/maps/Route1.asm +++ b/maps/Route1.asm @@ -3,8 +3,8 @@ connection east, SilentHill, SILENT_HILL, 0 object_const_def - object_const SUPER_NERD - object_const YOUNGSTER + const ROUTE_1_SUPER_NERD + const ROUTE_1_YOUNGSTER Route1_MapEvents:: dw $4000 ; unknown diff --git a/maps/Route19.asm b/maps/Route19.asm index 706eff29..4bedc0d5 100644 --- a/maps/Route19.asm +++ b/maps/Route19.asm @@ -17,7 +17,4 @@ Route19_MapEvents:: Route19_Blocks:: INCBIN "maps/Route19.blk" -Route19_ScriptLoader:: - ret - - db "@" + map_dummy_script_bank27 diff --git a/maps/Route2.asm b/maps/Route2.asm index 61fdb8ec..fb63d505 100644 --- a/maps/Route2.asm +++ b/maps/Route2.asm @@ -3,8 +3,8 @@ connection east, Route1, ROUTE_1, 9 object_const_def - object_const RIVAL - object_const KIMONO_GIRL + const ROUTE_2_RIVAL + const ROUTE_2_KIMONO_GIRL Route2_MapEvents:: dw $4000 ; unknown diff --git a/maps/Route2Gate1F.asm b/maps/Route2Gate1F.asm index 5f597778..1fa396ec 100644 --- a/maps/Route2Gate1F.asm +++ b/maps/Route2Gate1F.asm @@ -1,8 +1,8 @@ map_attributes Route2Gate1F, ROUTE_2_GATE_1F object_const_def - object_const YOUNGSTER - object_const COOLTRAINER_F + const ROUTE_2_GATE_1F_YOUNGSTER + const ROUTE_2_GATE_1F_COOLTRAINER_F Route2Gate1F_MapEvents:: dw $4000 ; unknown @@ -23,10 +23,9 @@ Route2Gate1F_MapEvents:: Route2Gate1F_Blocks:: INCBIN "maps/Route2Gate1F.blk" -Route2Gate1F_ScriptLoader:: map_generic_scriptloader - map_generic_scriptpointers - map_generic_npcids + map_generic_script_pointers + map_generic_npc_ids Route2Gate1FSignPointers: dw MapDefaultText ;no signs diff --git a/maps/Route2Gate2F.asm b/maps/Route2Gate2F.asm index bc2e6157..93e376cb 100644 --- a/maps/Route2Gate2F.asm +++ b/maps/Route2Gate2F.asm @@ -1,8 +1,8 @@ map_attributes Route2Gate2F, ROUTE_2_GATE_2F object_const_def - object_const LASS - object_const TWIN + const ROUTE_2_GATE_2F_LASS + const ROUTE_2_GATE_2F_TWIN Route2Gate2F_MapEvents:: dw $4000 ; unknown @@ -21,10 +21,9 @@ Route2Gate2F_MapEvents:: Route2Gate2F_Blocks:: INCBIN "maps/Route2Gate2F.blk" -Route2Gate2F_ScriptLoader:: map_generic_scriptloader - map_generic_scriptpointers - map_generic_npcids + map_generic_script_pointers + map_generic_npc_ids Route2Gate2FSignPointers: dw Route2Gate2FTextSign1 diff --git a/maps/SilentHill.asm b/maps/SilentHill.asm index 239b97d1..906974a1 100644 --- a/maps/SilentHill.asm +++ b/maps/SilentHill.asm @@ -4,10 +4,10 @@ connection east, Route23, ROUTE_23, 0 object_const_def - object_const RIVAL - object_const BLUE - object_const TEACHER - object_const SUPER_NERD + const SILENT_HILL_RIVAL + const SILENT_HILL_BLUE + const SILENT_HILL_TEACHER + const SILENT_HILL_SUPER_NERD SilentHill_MapEvents:: dw $4000 ; unknown diff --git a/maps/SilentHillLabBack.asm b/maps/SilentHillLabBack.asm index 430f7c9b..c6ae62dc 100644 --- a/maps/SilentHillLabBack.asm +++ b/maps/SilentHillLabBack.asm @@ -1,11 +1,11 @@ map_attributes SilentHillLabBack, SILENT_HILL_LAB_BACK object_const_def - object_const OAK - object_const RIVAL - object_const STARTER_HONOGUMA - object_const STARTER_KURUSU - object_const STARTER_HAPPA + const SILENT_HILL_LAB_BACK_OAK + const SILENT_HILL_LAB_BACK_RIVAL + const SILENT_HILL_LAB_BACK_STARTER_HONOGUMA + const SILENT_HILL_LAB_BACK_STARTER_KURUSU + const SILENT_HILL_LAB_BACK_STARTER_HAPPA SilentHillLabBack_MapEvents:: dw $4000 ; unknown @@ -31,24 +31,17 @@ SilentHillLabBack_MapEvents:: SilentHillLabBack_Blocks:: INCBIN "maps/SilentHillLabBack.blk" -SilentHillLabBack_ScriptLoader:: map_generic_scriptloader SilentHillLabBackScriptPointers:: - dw SilentHillLabBackScript1 - dw SilentHillLabBackNPCIDs1 - dw SilentHillLabBackScript2 - dw SilentHillLabBackNPCIDs1 - dw SilentHillLabBackScript3 - dw SilentHillLabBackNPCIDs1 - dw SilentHillLabBackRivalChoosePokemon - dw SilentHillLabBackNPCIDs1 - dw SilentHillLabBackScript5 - dw SilentHillLabBackNPCIDs1 - dw SilentHillLabBackScript6 - dw SilentHillLabBackNPCIDs1 - dw SilentHillLabBackScript7 - dw SilentHillLabBackNPCIDs1 + def_script_pointers + script_pointer SilentHillLabBackScript1, SilentHillLabBackNPCIDs1, SILENT_HILL_LAB_BACK_DEFAULT + script_pointer SilentHillLabBackScript2, SilentHillLabBackNPCIDs1, SILENT_HILL_LAB_BACK_OAK_INSTRUCTION + script_pointer SilentHillLabBackScript3, SilentHillLabBackNPCIDs1, SILENT_HILL_LAB_BACK_CHOOSE_STARTER + script_pointer SilentHillLabBackRivalChoosePokemon, SilentHillLabBackNPCIDs1, SILENT_HILL_LAB_BACK_RIVAL_CHOOSING_STARTER + script_pointer SilentHillLabBackScript5, SilentHillLabBackNPCIDs1, SILENT_HILL_LAB_BACK_RIVAL_CHOOSING_STARTER2 + script_pointer SilentHillLabBackScript6, SilentHillLabBackNPCIDs1, SILENT_HILL_LAB_BACK_RIVAL_CHOOSING_STARTER3 + script_pointer SilentHillLabBackScript7, SilentHillLabBackNPCIDs1, SILENT_HILL_LAB_BACK_CUTSCENE_OVER SilentHillLabBackNPCIDs1: npc_id SILENT_HILL_LAB_BACK_OAK @@ -95,7 +88,7 @@ SilentHillLabBackScript1: SetEvent SILENT_HILL_LAB_BACK_FOLLOWED_OAK ld hl, wOverworldFlags set OVERWORLD_PAUSE_MAP_PROCESSES_F, [hl] - ld a, 1 + ld a, SILENT_HILL_LAB_BACK_OAK_INSTRUCTION ld [wMapScriptNumber], a ld a, MAPSTATUS_EVENT_RUNNING call SetMapStatus @@ -120,7 +113,7 @@ SilentHillLabBackScript2: call OpenTextbox ld hl, SilentHillLabBackTextString2 call OpenTextbox - ld a, 2 + ld a, SILENT_HILL_LAB_BACK_CHOOSE_STARTER ld [wMapScriptNumber], a ret @@ -148,7 +141,7 @@ SilentHillLabBackRivalChoosePokemon: call LoadMovementDataPointer ld hl, wOverworldFlags set 7, [hl] - ld a, 4 + ld a, SILENT_HILL_LAB_BACK_RIVAL_CHOOSING_STARTER2 ld [wMapScriptNumber], a ld a, MAPSTATUS_EVENT_RUNNING call SetMapStatus @@ -175,7 +168,7 @@ SilentHillLabBackScript5: call GetPokemonName ld hl, SilentHillLabBackTextString13 call OpenTextbox - ld a, 5 + ld a, SILENT_HILL_LAB_BACK_RIVAL_CHOOSING_STARTER3 ld [wMapScriptNumber], a ret @@ -183,7 +176,7 @@ SilentHillLabBackScript6: call UnfreezeEverything ld hl, wOverworldFlags res 6, [hl] - ld a, 6 + ld a, SILENT_HILL_LAB_BACK_CUTSCENE_OVER ld[wMapScriptNumber], a ret @@ -260,11 +253,11 @@ ConfirmPokemonSelection: call YesNoBox jr c, .bigJump SetEvent SILENT_HILL_LAB_BACK_CHOSE_STARTER - ld a, 1 + ld a, PLAYER_HOUSE_1F_MOM_BACK ld [wPlayerHouse1FSceneID], a - ld a, 1 + ld a, PLAYER_HOUSE_2F_KEN_LEFT ld [wPlayerHouse2FSceneID], a - ld a, 1 + ld a, RIVAL_HOUSE_KEN_HERE ld [wRivalHouseSceneID], a ld hl, SilentHillLabBackTextString8 call PrintText @@ -277,7 +270,7 @@ ConfirmPokemonSelection: callfar GivePoke xor a ld [wPartyMon1 + 1], a - ld a, 3 + ld a, SILENT_HILL_LAB_BACK_RIVAL_CHOOSING_STARTER ld [wMapScriptNumber], a ret .bigJump diff --git a/maps/SilentHillLabBackUnused.asm b/maps/SilentHillLabBackUnused.asm index 239f4c66..67bfb980 100644 --- a/maps/SilentHillLabBackUnused.asm +++ b/maps/SilentHillLabBackUnused.asm @@ -5,9 +5,8 @@ SilentHillLabBackUnused_MapEvents:: SilentHillLabBackUnused_Blocks:: INCBIN "maps/SilentHillLabBackUnused.blk" -SilentHillLabBackUnused_ScriptLoader:: map_generic_scriptloader - map_generic_scriptpointers + map_generic_script_pointers SilentHillLabBackUnusedNPCIDs: db $FF diff --git a/maps/SilentHillLabFront.asm b/maps/SilentHillLabFront.asm index 6fd7df42..92409164 100644 --- a/maps/SilentHillLabFront.asm +++ b/maps/SilentHillLabFront.asm @@ -1,17 +1,17 @@ map_attributes SilentHillLabFront, SILENT_HILL_LAB_FRONT object_const_def - object_const OAK1 - object_const OAK2 - object_const RIVAL1 - object_const RIVAL2 - object_const BLUE1 - object_const BLUE2 - object_const NANAMI - object_const OAKS_AIDE1 - object_const OAKS_AIDE2 - object_const POKEDEX1 - object_const POKEDEX2 + const SILENT_HILL_LAB_FRONT_OAK1 + const SILENT_HILL_LAB_FRONT_OAK2 + const SILENT_HILL_LAB_FRONT_RIVAL1 + const SILENT_HILL_LAB_FRONT_RIVAL2 + const SILENT_HILL_LAB_FRONT_BLUE1 + const SILENT_HILL_LAB_FRONT_BLUE2 + const SILENT_HILL_LAB_FRONT_NANAMI + const SILENT_HILL_LAB_FRONT_OAKS_AIDE1 + const SILENT_HILL_LAB_FRONT_OAKS_AIDE2 + const SILENT_HILL_LAB_FRONT_POKEDEX1 + const SILENT_HILL_LAB_FRONT_POKEDEX2 SilentHillLabFront_MapEvents:: dw $4000 ; unknown @@ -54,69 +54,29 @@ SilentHillLabFront_MapEvents:: SilentHillLabFront_Blocks:: INCBIN "maps/SilentHillLabFront.blk" -SilentHillLabFront_ScriptLoader:: - ld hl, SilentHillLabFrontScriptPointers - call RunMapScript - call WriteBackMapScriptNumber - ret + map_generic_scriptloader SilentHillLabFrontScriptPointers:: - dw SilentHillLabFrontScript1 - dw SilentHillLabFrontNPCIDs1 - - dw SilentHillLabFrontScript2 - dw SilentHillLabFrontNPCIDs2 - - dw SilentHillLabFrontScript3 - dw SilentHillLabFrontNPCIDs2 - - dw SilentHillLabFrontScript4 - dw SilentHillLabFrontNPCIDs2 - - dw SilentHillLabFrontConversation1 - dw SilentHillLabFrontNPCIDs2 - - dw SilentHillLabFrontScript6 - dw SilentHillLabFrontNPCIDs3 - - dw SilentHillLabFrontScript7 - dw SilentHillLabFrontNPCIDs4 - - dw SilentHillLabFrontScript8 - dw SilentHillLabFrontNPCIDs5 - - dw SilentHillLabFrontScript9 - dw SilentHillLabFrontNPCIDs5 - - dw SilentHillLabFrontScript10 - dw SilentHillLabFrontNPCIDs5 - - dw SilentHillLabFrontScript11 - dw SilentHillLabFrontNPCIDs5 - - dw SilentHillLabFrontScript12 - dw SilentHillLabFrontNPCIDs6 - - dw SilentHillLabFrontScript13 - dw SilentHillLabFrontNPCIDs6 - - dw SilentHillLabFrontScript14 - dw SilentHillLabFrontNPCIDs6 - - dw SilentHillLabFrontScript15 - dw SilentHillLabFrontNPCIDs7 - - dw SilentHillLabFrontScript16 - dw SilentHillLabFrontNPCIDs7 - - dw SilentHillLabFrontScript17 - dw SilentHillLabFrontNPCIDs7 - - dw SilentHillLabFrontScript18 - dw SilentHillLabFrontNPCIDs7 - - dw SilentHillLabFrontScript19 - dw SilentHillLabFrontNPCIDs9 + def_script_pointers + script_pointer SilentHillLabFrontScript1, SilentHillLabFrontNPCIDs1, SILENT_HILL_LAB_FRONT_DEFAULT + script_pointer SilentHillLabFrontScript2, SilentHillLabFrontNPCIDs2, SILENT_HILL_LAB_FRONT_START_BLUE_CUTSCENE + script_pointer SilentHillLabFrontScript3, SilentHillLabFrontNPCIDs2, SILENT_HILL_LAB_FRONT_BLUE_CUTSCENE + script_pointer SilentHillLabFrontScript4, SilentHillLabFrontNPCIDs2, SILENT_HILL_LAB_FRONT_BLUE_CUTSCENE_2 + script_pointer SilentHillLabFrontConversation1, SilentHillLabFrontNPCIDs2, SILENT_HILL_LAB_FRONT_BLUE_CUTSCENE_CONVERSATION + script_pointer SilentHillLabFrontScript6, SilentHillLabFrontNPCIDs3, SILENT_HILL_LAB_FRONT_BLUE_CUTSCENE_END + script_pointer SilentHillLabFrontScript7, SilentHillLabFrontNPCIDs4, SILENT_HILL_LAB_FRONT_RIVAL_ENTER_BACK + script_pointer SilentHillLabFrontScript8, SilentHillLabFrontNPCIDs5, SILENT_HILL_LAB_FRONT_ENTER_BACK + script_pointer SilentHillLabFrontScript9, SilentHillLabFrontNPCIDs5, SILENT_HILL_LAB_FRONT_RIVAL_CUTSCENE + script_pointer SilentHillLabFrontScript10, SilentHillLabFrontNPCIDs5, SILENT_HILL_LAB_FRONT_RIVAL_CUTSCENE_2 + script_pointer SilentHillLabFrontScript11, SilentHillLabFrontNPCIDs5, SILENT_HILL_LAB_FRONT_GET_POKEDEX + script_pointer SilentHillLabFrontScript12, SilentHillLabFrontNPCIDs6, SILENT_HILL_LAB_FRONT_RIVAL_WAIT_FOR_BATTLE + script_pointer SilentHillLabFrontScript13, SilentHillLabFrontNPCIDs6, SILENT_HILL_LAB_FRONT_RIVAL_START_BATTLE + script_pointer SilentHillLabFrontScript14, SilentHillLabFrontNPCIDs6, SILENT_HILL_LAB_FRONT_RIVAL_BATTLE_END + script_pointer SilentHillLabFrontScript15, SilentHillLabFrontNPCIDs7, SILENT_HILL_LAB_FRONT_RIVAL_LEFT + script_pointer SilentHillLabFrontScript16, SilentHillLabFrontNPCIDs7, SILENT_HILL_LAB_FRONT_RIVAL_LEFT_END + script_pointer SilentHillLabFrontScript17, SilentHillLabFrontNPCIDs7, SILENT_HILL_LAB_FRONT_GET_POKEBALLS + script_pointer SilentHillLabFrontScript18, SilentHillLabFrontNPCIDs7, SILENT_HILL_LAB_FRONT_GOT_POKEBALLS + script_pointer SilentHillLabFrontScript19, SilentHillLabFrontNPCIDs9, SILENT_HILL_LAB_FRONT_FINISHED SilentHillLabFrontNPCIDs1: npc_id SILENT_HILL_LAB_FRONT_RIVAL1 @@ -241,7 +201,7 @@ SilentHillLabFrontMovement1: step_end SilentHillLabFrontScript2: - ld a, 2 + ld a, SILENT_HILL_LAB_FRONT_BLUE_CUTSCENE ld [wMapScriptNumber], a ret @@ -258,7 +218,7 @@ SilentHillLabFrontScript3: call LoadMovementDataPointer ld hl, wOverworldFlags set 7, [hl] - ld a, 3 + ld a, SILENT_HILL_LAB_FRONT_BLUE_CUTSCENE_2 ld [wMapScriptNumber], a ld a, MAPSTATUS_EVENT_RUNNING call SetMapStatus @@ -281,7 +241,7 @@ SilentHillLabFrontMovement2: SilentHillLabFrontScript4: call FreezeAllObjects - ld a, 4 + ld a, SILENT_HILL_LAB_FRONT_BLUE_CUTSCENE_CONVERSATION ld [wMapScriptNumber], a ret @@ -320,7 +280,7 @@ SilentHillLabFrontScript5: call LoadMovementDataPointer ld hl, wOverworldFlags set 7, [hl] - ld a, 5 + ld a, SILENT_HILL_LAB_FRONT_BLUE_CUTSCENE_END ld [wMapScriptNumber], a ld a, MAPSTATUS_EVENT_RUNNING call SetMapStatus @@ -341,7 +301,7 @@ SilentHillLabFrontScript6: call LoadMovementDataPointer ld hl, wOverworldFlags set 7, [hl] - ld a, 6 + ld a, SILENT_HILL_LAB_FRONT_RIVAL_ENTER_BACK ld [wMapScriptNumber], a ld a, MAPSTATUS_EVENT_RUNNING call SetMapStatus @@ -365,7 +325,7 @@ SilentHillLabFrontScript7: call LoadMovementDataPointer ld hl, wOverworldFlags set 7, [hl] - ld a, 7 + ld a, SILENT_HILL_LAB_FRONT_ENTER_BACK ld [wMapScriptNumber], a ld a, MAPSTATUS_EVENT_RUNNING call SetMapStatus @@ -392,7 +352,7 @@ SilentHillLabFrontScript8: call LoadMovementDataPointer ld hl, wOverworldFlags set 7, [hl] - ld a, 8 + ld a, SILENT_HILL_LAB_FRONT_RIVAL_CUTSCENE ld [wMapScriptNumber], a ld a, MAPSTATUS_EVENT_RUNNING call SetMapStatus @@ -418,7 +378,7 @@ SilentHillLabFrontScript9: call LoadMovementDataPointer ld hl, wOverworldFlags set 7, [hl] - ld a, 9 + ld a, SILENT_HILL_LAB_FRONT_RIVAL_CUTSCENE_2 ld [wMapScriptNumber], a ld a, MAPSTATUS_EVENT_RUNNING call SetMapStatus @@ -456,7 +416,7 @@ SilentHillLabFrontScript10: call LoadMovementDataPointer ld hl, wOverworldFlags set 7, [hl] - ld a, $0A + ld a, SILENT_HILL_LAB_FRONT_GET_POKEDEX ld [wMapScriptNumber], a ld a, MAPSTATUS_EVENT_RUNNING call SetMapStatus @@ -472,9 +432,9 @@ SilentHillLabFrontScript11: call OpenTextbox ld hl, SilentHillLabFrontTextString9 call OpenTextbox - ld a, $0B + ld a, SILENT_HILL_LAB_FRONT_POKEDEX1 call ApplyDeletionToMapObject - ld a, $0C + ld a, SILENT_HILL_LAB_FRONT_POKEDEX2 call ApplyDeletionToMapObject ld hl, SilentHillLabFrontTextString10 call OpenTextbox @@ -482,7 +442,7 @@ SilentHillLabFrontScript11: call OpenTextbox SetEvent SILENT_HILL_LAB_FRONT_GOT_POKEDEX call UnfreezeEverything - ld a, $0B + ld a, SILENT_HILL_LAB_FRONT_RIVAL_WAIT_FOR_BATTLE ld [wMapScriptNumber], a call InitObjectMasks ret @@ -519,7 +479,7 @@ SilentHillLabFrontRivalMovePokemon: call LoadMovementDataPointer ld hl, wOverworldFlags set 7, [hl] - ld a, $0C + ld a, SILENT_HILL_LAB_FRONT_RIVAL_START_BATTLE ld [wMapScriptNumber], a ld a, MAPSTATUS_EVENT_RUNNING call SetMapStatus @@ -551,7 +511,7 @@ SilentHillLabFrontScript13: set 7, [hl] ld a, MAPSTATUS_START_TRAINER_BATTLE ld [wMapStatus], a - ld a, $0D + ld a, SILENT_HILL_LAB_FRONT_RIVAL_BATTLE_END ld [wMapScriptNumber], a call InitObjectMasks ret @@ -598,7 +558,7 @@ SilentHillLabFrontScript14: call LoadMovementDataPointer ld hl, wOverworldFlags set 7, [hl] - ld a, $0E + ld a, SILENT_HILL_LAB_FRONT_RIVAL_LEFT ld [wMapScriptNumber], a ld a, MAPSTATUS_EVENT_RUNNING call SetMapStatus @@ -613,7 +573,7 @@ SilentHillLabFrontMovement11: SilentHillLabFrontScript15: call UnfreezeEverything - ld a, $0F + ld a, SILENT_HILL_LAB_FRONT_RIVAL_LEFT_END ld [wMapScriptNumber], a call InitObjectMasks ret @@ -650,7 +610,7 @@ SilentHillLabFrontMoveRivalLeave: call LoadMovementDataPointer ld hl, wOverworldFlags set 7, [hl] - ld a, $10 + ld a, SILENT_HILL_LAB_FRONT_GET_POKEBALLS ld [wMapScriptNumber], a ld a, MAPSTATUS_EVENT_RUNNING call SetMapStatus @@ -675,7 +635,7 @@ SilentHillLabFrontScript17: ld [wItemQuantity], a call ReceiveItem call UnfreezeEverything - ld a, $11 + ld a, SILENT_HILL_LAB_FRONT_GOT_POKEBALLS ld [wMapScriptNumber], a ret diff --git a/maps/SilentHillPokecenter.asm b/maps/SilentHillPokecenter.asm index db6647eb..174b78d0 100644 --- a/maps/SilentHillPokecenter.asm +++ b/maps/SilentHillPokecenter.asm @@ -1,11 +1,11 @@ - map_attributes SilentHillPokecenter, SILENT_HILL_POKECENTER + map_attributes SilentHillPokecenter, SILENT_HILL_POKECENTER object_const_def - object_const NURSE - object_const GENTLEMAN - object_const COOLTRAINER_M - object_const YOUNGSTER - object_const HOUNDOOM + const SILENT_HILL_POKECENTER_NURSE + const SILENT_HILL_POKECENTER_GENTLEMAN + const SILENT_HILL_POKECENTER_COOLTRAINER_M + const SILENT_HILL_POKECENTER_YOUNGSTER + const SILENT_HILL_POKECENTER_HOUNDOOM SilentHillPokecenter_MapEvents:: dw $4000 ; unknown @@ -27,14 +27,13 @@ SilentHillPokecenter_MapEvents:: SilentHillPokecenter_Blocks:: INCBIN "maps/SilentHillPokecenter.blk" -SilentHillPokecenter_ScriptLoader:: map_generic_scriptloader - map_generic_scriptpointers + map_generic_script_pointers map_generic_script dw SilentHillPokecenterNPCIDs - map_generic_npcids + map_generic_npc_ids SilentHillPokecenterSignPointers: dw SilentHillPokecenterPCText diff --git a/maps/scripts/Route1.asm b/maps/scripts/Route1.asm index 713c745c..b74b9221 100644 --- a/maps/scripts/Route1.asm +++ b/maps/scripts/Route1.asm @@ -5,8 +5,8 @@ Route1_ScriptLoader:: ret Route1ScriptPointers:: - dw Route1Script - dw Route1NPCIDs + def_script_pointers + script_pointer Route1Script, Route1NPCIDs, ROUTE_1_DEFAULT Route1NPCIDs: npc_id ROUTE_1_SUPER_NERD diff --git a/maps/scripts/Route2.asm b/maps/scripts/Route2.asm index ca12c4f6..e455fa20 100644 --- a/maps/scripts/Route2.asm +++ b/maps/scripts/Route2.asm @@ -5,8 +5,8 @@ Route2_ScriptLoader:: ret Route2ScriptPointers:: - dw Route2Script - dw Route2NPCIDs + def_script_pointers + script_pointer Route2Script, Route2NPCIDs, ROUTE_2_DEFAULT Route2NPCIDs: npc_id ROUTE_2_RIVAL diff --git a/maps/scripts/SilentHill.asm b/maps/scripts/SilentHill.asm index 07363114..7efb331b 100644 --- a/maps/scripts/SilentHill.asm +++ b/maps/scripts/SilentHill.asm @@ -24,32 +24,14 @@ SilentHillNPCIDs3: db -1 SilentHillScriptPointers:: - dw SilentHillScript1 - dw SilentHillNPCIDs1 - -SilentHillScriptPointers2: - dw SilentHillScript2 - dw SilentHillNPCIDs1 - -SilentHillScriptPointers3: - dw SilentHillScript3 - dw SilentHillNPCIDs1 - -SilentHillScriptPointers4: - dw SilentHillScript4 - dw SilentHillNPCIDs2 - -SilentHillScriptPointers5: - dw SilentHillScript5 - dw SilentHillNPCIDs3 - -SilentHillScriptPointers6: - dw SilentHillScript6 - dw SilentHillNPCIDs2 - -SilentHillScriptPointers7: - dw SilentHillScript7 - dw SilentHillNPCIDs2 + def_script_pointers + script_pointer SilentHillScript1, SilentHillNPCIDs1, SILENT_HILL_DEFAULT + script_pointer SilentHillScript2, SilentHillNPCIDs1, SILENT_HILL_RIVAL_CUTSCENE + script_pointer SilentHillScript3, SilentHillNPCIDs1, SILENT_HILL_RIVAL_CUTSCENE_2 + script_pointer SilentHillScript4, SilentHillNPCIDs2, SILENT_HILL_RIVAL_CUTSCENE_END + script_pointer SilentHillScript5, SilentHillNPCIDs3, SILENT_HILL_BLUE_CUTSCENE + script_pointer SilentHillScript6, SilentHillNPCIDs2, SILENT_HILL_FOLLOW_BLUE + script_pointer SilentHillScript7, SilentHillNPCIDs2, SILENT_HILL_GOT_STARTER SilentHillScript1: ld a, [wYCoord] @@ -67,7 +49,7 @@ SilentHillScript1: call LoadMovementDataPointer ld hl, wOverworldFlags set 7, [hl] - ld a, 1 + ld a, SILENT_HILL_RIVAL_CUTSCENE ld [wMapScriptNumber], a ld a, MAPSTATUS_EVENT_RUNNING call SetMapStatus @@ -99,7 +81,7 @@ SilentHillScript2: set 7, [hl] ld a, MAPSTATUS_EVENT_RUNNING call SetMapStatus - ld a, $02 + ld a, SILENT_HILL_RIVAL_CUTSCENE_2 ld [wMapScriptNumber], a ret @@ -114,7 +96,7 @@ SilentHillMovement2: SilentHillScript3: call UnfreezeAllObjects - ld a, 3 + ld a, SILENT_HILL_RIVAL_CUTSCENE_END ld [wMapScriptNumber], a call InitObjectMasks ret @@ -152,7 +134,7 @@ SilentHillScript4: set 7, [hl] ld a, MAPSTATUS_EVENT_RUNNING call SetMapStatus - ld a, 4 + ld a, SILENT_HILL_BLUE_CUTSCENE ld [wMapScriptNumber], a ret @@ -164,7 +146,7 @@ SilentHillScript4: .TalkedToBlue: SetEvent SILENT_HILL_TALKED_TO_BLUE - ld a, 1 + ld a, SILENT_HILL_LAB_FRONT_START_BLUE_CUTSCENE ld hl, wSilentHillLabFrontSceneID ld [hl], a ret @@ -217,7 +199,7 @@ SilentHillScript5: set 7, [hl] ld a, MAPSTATUS_EVENT_RUNNING call SetMapStatus - ld a, 5 + ld a, SILENT_HILL_FOLLOW_BLUE ld [wMapScriptNumber], a ret @@ -270,9 +252,9 @@ SilentHillScript6: call CallMapTextSubroutine CheckEvent SILENT_HILL_LAB_BACK_CHOSE_STARTER ret z - ld a, $12 + ld a, SILENT_HILL_LAB_FRONT_FINISHED ld [wSilentHillLabFrontSceneID], a - ld a, 6 + ld a, SILENT_HILL_GOT_STARTER ld [wMapScriptNumber], a ret