dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

I guess I'm documenting Trainer Hill now

Browse Source
This commit is contained in:
Phlosioneer
2019-02-27 21:28:34 -05:00
parent e77e7844ea
commit 66f0616a2d
13 changed files with 90 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/event_scripts.s
+8 -7
View File
@@ -16,6 +16,7 @@
#include "constants/trainers.h"
#include "constants/vars.h"
#include "constants/weather.h"
#include "constants/trainer_hill.h"
.include "asm/macros.inc"
.include "asm/macros/event.inc"
.include "constants/constants.inc"
@@ -2758,7 +2759,7 @@ EventScript_2736F8:: @ 82736F8
goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42
compare VAR_RESULT, 2
goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42
setvar VAR_0x8004, 10
setvar VAR_0x8004, TRAINER_HILL_FUNC_10
special CallTrainerHillFunction
compare VAR_RESULT, 1
goto_if_eq TrainerHill_1F_EventScript_2C83C9
@@ -6925,7 +6926,7 @@ TrainerHill_3F_MapScript1_2C8336: @ 82C8336
TrainerHill_4F_MapScript1_2C8336: @ 82C8336
TrainerHill_Roof_MapScript1_2C8336: @ 82C8336
setvar VAR_TEMP_2, 0
setvar VAR_0x8004, 4
setvar VAR_0x8004, TRAINER_HILL_FUNC_4
special CallTrainerHillFunction
setvar VAR_0x8004, 1
setvar VAR_0x8005, 5
@@ -6958,7 +6959,7 @@ TrainerHill_Roof_MapScript2_2C8381: @ 82C8381
EventScript_TrainerHillTimer:: @ 82C8393
lockall
setvar VAR_0x8004, 7
setvar VAR_0x8004, TRAINER_HILL_FUNC_7
special CallTrainerHillFunction
msgbox TrainerHill_Entrance_Text_268D47, MSGBOX_DEFAULT
releaseall
@@ -6966,7 +6967,7 @@ EventScript_TrainerHillTimer:: @ 82C8393
TrainerHill_1F_EventScript_2C83A6:: @ 82C83A6
setvar VAR_TEMP_2, 1
setvar VAR_0x8004, 9
setvar VAR_0x8004, TRAINER_HILL_FUNC_9
special CallTrainerHillFunction
compare VAR_RESULT, 1
goto_if_eq TrainerHill_1F_EventScript_2C83BF
@@ -6978,9 +6979,9 @@ TrainerHill_1F_EventScript_2C83BF:: @ 82C83BF
end
TrainerHill_1F_EventScript_2C83C9:: @ 82C83C9
setvar VAR_0x8004, 12
setvar VAR_0x8004, TRAINER_HILL_FUNC_12
special CallTrainerHillFunction
setvar VAR_0x8004, 5
setvar VAR_0x8004, TRAINER_HILL_FUNC_5
special CallTrainerHillFunction
setvar VAR_TEMP_1, 1
end
@@ -6998,7 +6999,7 @@ TrainerHill_1F_Movement_2C83EE:: @ 82C83EE
EventScript_2C83F0:: @ 82C83F0
trainerbattle TRAINER_BATTLE_12, TRAINER_PHILLIP, 0, BattleFacility_TrainerBattle_PlaceholderText, BattleFacility_TrainerBattle_PlaceholderText
setvar VAR_0x8004, 11
setvar VAR_0x8004, TRAINER_HILL_FUNC_11
special CallTrainerHillFunction
waitmessage
waitbuttonpress
data/map_events.s
+1
View File
@@ -8,6 +8,7 @@
#include "constants/secret_bases.h"
#include "constants/vars.h"
#include "constants/weather.h"
#include "constants/trainer_hill.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
data/maps.s
+1 -1
View File
@@ -4,7 +4,7 @@
#include "constants/weather.h"
#include "constants/region_map_sections.h"
#include "constants/songs.h"
#include "constants/weather.h"
#include "constants/trainer_hill.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
data/maps/TrainerHill_Entrance/scripts.inc
+12 -13
View File
@@ -15,10 +15,10 @@ TrainerHill_Entrance_MapScript1_2680CF: @ 82680CF
end
TrainerHill_Entrance_MapScript1_2680D0: @ 82680D0
setvar VAR_0x8004, 4
setvar VAR_0x8004, TRAINER_HILL_FUNC_4
special CallTrainerHillFunction
setvar VAR_TEMP_0, 0
setvar VAR_0x8004, 9
setvar VAR_0x8004, TRAINER_HILL_FUNC_9
special CallTrainerHillFunction
compare VAR_RESULT, 0
goto_if_eq TrainerHill_Entrance_EventScript_2680FF
@@ -27,7 +27,7 @@ TrainerHill_Entrance_MapScript1_2680D0: @ 82680D0
end
TrainerHill_Entrance_EventScript_2680FF:: @ 82680FF
setvar VAR_0x8004, 16
setvar VAR_0x8004, TRAINER_HILL_FUNC_16
special CallTrainerHillFunction
compare VAR_RESULT, 1
goto_if_eq TrainerHill_Entrance_EventScript_26811A
@@ -74,7 +74,7 @@ TrainerHill_Entrance_EventScript_268160:: @ 8268160
TrainerHill_Entrance_EventScript_268182:: @ 8268182
setvar VAR_TEMP_0, 1
setvar VAR_0x8004, 6
setvar VAR_0x8004, TRAINER_HILL_FUNC_6
special CallTrainerHillFunction
switch VAR_RESULT
case 0, TrainerHill_Entrance_EventScript_2681B5
@@ -91,7 +91,6 @@ TrainerHill_Entrance_EventScript_2681CA:: @ 82681CA
lockall
applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_26837F
msgbox TrainerHill_Entrance_Text_268712, MSGBOX_DEFAULT
@ No "end" command; intentional fall-through to TrainerHill_Entrance_EventScript_2681DA.
TrainerHill_Entrance_EventScript_2681DA:: @ 82681DA
closemessage
@@ -115,7 +114,7 @@ TrainerHill_Entrance_EventScript_2681EF:: @ 82681EF
TrainerHill_Entrance_EventScript_2681FD:: @ 82681FD
lock
faceplayer
setvar VAR_0x8004, 10
setvar VAR_0x8004, TRAINER_HILL_FUNC_10
special CallTrainerHillFunction
compare VAR_RESULT, 0
goto_if_eq TrainerHill_Entrance_EventScript_26821F
@@ -134,11 +133,11 @@ TrainerHill_Entrance_EventScript_268229:: @ 8268229
applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_26837F
goto_if_unset FLAG_SYS_GAME_CLEAR, TrainerHill_Entrance_EventScript_26836A
msgbox TrainerHill_Entrance_Text_2684C6, MSGBOX_DEFAULT
setvar VAR_0x8004, 13
setvar VAR_0x8004, TRAINER_HILL_FUNC_13
special CallTrainerHillFunction
compare VAR_RESULT, 0
call_if_eq TrainerHill_Entrance_EventScript_26832E
setvar VAR_0x8004, 8
setvar VAR_0x8004, TRAINER_HILL_FUNC_8
special CallTrainerHillFunction
compare VAR_RESULT, 1
goto_if_eq TrainerHill_Entrance_EventScript_268275
@@ -169,14 +168,14 @@ TrainerHill_Entrance_EventScript_2682C8:: @ 82682C8
switch VAR_RESULT
case 4, TrainerHill_Entrance_EventScript_268314
case 127, TrainerHill_Entrance_EventScript_268314
setvar VAR_0x8004, 17
setvar VAR_0x8004, TRAINER_HILL_FUNC_17
copyvar VAR_0x8005, VAR_RESULT
special CallTrainerHillFunction
setvar VAR_0x40D6, 1
setvar VAR_TEMP_5, 0
special HealPlayerParty
msgbox TrainerHill_Entrance_Text_26862A, MSGBOX_DEFAULT
setvar VAR_0x8004, 0
setvar VAR_0x8004, TRAINER_HILL_FUNC_0
special CallTrainerHillFunction
releaseall
end
@@ -192,18 +191,18 @@ TrainerHill_Entrance_EventScript_268314:: @ 8268314
TrainerHill_Entrance_EventScript_26832E:: @ 826832E
msgbox TrainerHill_Entrance_Text_26851C, MSGBOX_DEFAULT
setvar VAR_0x8004, 14
setvar VAR_0x8004, TRAINER_HILL_FUNC_14
special CallTrainerHillFunction
setvar VAR_TEMP_5, 1
call Common_EventScript_SaveGame
compare VAR_RESULT, 0
goto_if_eq TrainerHill_Entrance_EventScript_26835C
setvar VAR_0x8004, 14
setvar VAR_0x8004, TRAINER_HILL_FUNC_14
special CallTrainerHillFunction
return
TrainerHill_Entrance_EventScript_26835C:: @ 826835C
setvar VAR_0x8004, 15
setvar VAR_0x8004, TRAINER_HILL_FUNC_15
special CallTrainerHillFunction
goto TrainerHill_Entrance_EventScript_268314
end
data/maps/TrainerHill_Roof/scripts.inc
+4 -4
View File
@@ -4,11 +4,11 @@ TrainerHill_Roof_MapScripts:: @ 8268FA7
.byte 0
TrainerHill_Roof_EventScript_268FB2:: @ 8268FB2
setvar VAR_0x8004, 12
setvar VAR_0x8004, TRAINER_HILL_FUNC_12
special CallTrainerHillFunction
lock
faceplayer
setvar VAR_0x8004, 1
setvar VAR_0x8004, TRAINER_HILL_FUNC_1
special CallTrainerHillFunction
switch VAR_RESULT
case 0, TrainerHill_Roof_EventScript_268FEA
@@ -19,7 +19,7 @@ TrainerHill_Roof_EventScript_268FEA:: @ 8268FEA
msgbox TrainerHill_Roof_Text_268986, MSGBOX_DEFAULT
TrainerHill_Roof_EventScript_268FF2:: @ 8268FF2
setvar VAR_0x8004, 2
setvar VAR_0x8004, TRAINER_HILL_FUNC_2
special CallTrainerHillFunction
switch VAR_RESULT
case 0, TrainerHill_Roof_EventScript_269020
@@ -41,7 +41,7 @@ TrainerHill_Roof_EventScript_269037:: @ 8269037
goto TrainerHill_Roof_EventScript_269054
TrainerHill_Roof_EventScript_269054:: @ 8269054
setvar VAR_0x8004, 3
setvar VAR_0x8004, TRAINER_HILL_FUNC_3
special CallTrainerHillFunction
switch VAR_RESULT
case 0, TrainerHill_Roof_EventScript_269082