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

Move some vars to C

Browse Source
This commit is contained in:
DizzyEggg
2019-01-13 13:15:23 +01:00
parent 11a49a7f02
commit c0bc01d301
19 changed files with 282 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
data/maps/TrainerHill_Entrance/scripts.inc
View File

@@ -16,10 +16,10 @@ TrainerHill_Entrance_MapScript1_2680CF: @ 82680CF
TrainerHill_Entrance_MapScript1_2680D0: @ 82680D0
setvar VAR_0x8004, 4
special sp194_trainer_tower
special CallTrainerHillFunction
setvar VAR_TEMP_0, 0
setvar VAR_0x8004, 9
special sp194_trainer_tower
special CallTrainerHillFunction
compare VAR_RESULT, 0
goto_if_eq TrainerHill_Entrance_EventScript_2680FF
setobjectxy EVENT_OBJ_ID_PLAYER, 9, 6
@@ -28,7 +28,7 @@ TrainerHill_Entrance_MapScript1_2680D0: @ 82680D0
TrainerHill_Entrance_EventScript_2680FF:: @ 82680FF
setvar VAR_0x8004, 16
special sp194_trainer_tower
special CallTrainerHillFunction
compare VAR_RESULT, 1
goto_if_eq TrainerHill_Entrance_EventScript_26811A
applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_26837F
@@ -75,7 +75,7 @@ TrainerHill_Entrance_EventScript_268160:: @ 8268160
TrainerHill_Entrance_EventScript_268182:: @ 8268182
setvar VAR_TEMP_0, 1
setvar VAR_0x8004, 6
special sp194_trainer_tower
special CallTrainerHillFunction
switch VAR_RESULT
case 0, TrainerHill_Entrance_EventScript_2681B5
case 1, TrainerHill_Entrance_EventScript_2681CA
@@ -115,7 +115,7 @@ TrainerHill_Entrance_EventScript_2681FD:: @ 82681FD
lock
faceplayer
setvar VAR_0x8004, 10
special sp194_trainer_tower
special CallTrainerHillFunction
compare VAR_RESULT, 0
goto_if_eq TrainerHill_Entrance_EventScript_26821F
msgbox TrainerHill_Entrance_Text_2686F4, MSGBOX_DEFAULT
@@ -134,11 +134,11 @@ TrainerHill_Entrance_EventScript_268229:: @ 8268229
goto_if_unset FLAG_SYS_GAME_CLEAR, TrainerHill_Entrance_EventScript_26836A
msgbox TrainerHill_Entrance_Text_2684C6, MSGBOX_DEFAULT
setvar VAR_0x8004, 13
special sp194_trainer_tower
special CallTrainerHillFunction
compare VAR_RESULT, 0
call_if_eq TrainerHill_Entrance_EventScript_26832E
setvar VAR_0x8004, 8
special sp194_trainer_tower
special CallTrainerHillFunction
compare VAR_RESULT, 1
goto_if_eq TrainerHill_Entrance_EventScript_268275
msgbox TrainerHill_Entrance_Text_268564, MSGBOX_DEFAULT
@@ -170,13 +170,13 @@ TrainerHill_Entrance_EventScript_2682C8:: @ 82682C8
case 127, TrainerHill_Entrance_EventScript_268314
setvar VAR_0x8004, 17
copyvar VAR_0x8005, VAR_RESULT
special sp194_trainer_tower
special CallTrainerHillFunction
setvar VAR_0x40D6, 1
setvar VAR_TEMP_5, 0
special HealPlayerParty
msgbox TrainerHill_Entrance_Text_26862A, MSGBOX_DEFAULT
setvar VAR_0x8004, 0
special sp194_trainer_tower
special CallTrainerHillFunction
releaseall
end
@@ -192,18 +192,18 @@ TrainerHill_Entrance_EventScript_268314:: @ 8268314
TrainerHill_Entrance_EventScript_26832E:: @ 826832E
msgbox TrainerHill_Entrance_Text_26851C, MSGBOX_DEFAULT
setvar VAR_0x8004, 14
special sp194_trainer_tower
special CallTrainerHillFunction
setvar VAR_TEMP_5, 1
call TrainerHill_Entrance_EventScript_27134F
compare VAR_RESULT, 0
goto_if_eq TrainerHill_Entrance_EventScript_26835C
setvar VAR_0x8004, 14
special sp194_trainer_tower
special CallTrainerHillFunction
return
TrainerHill_Entrance_EventScript_26835C:: @ 826835C
setvar VAR_0x8004, 15
special sp194_trainer_tower
special CallTrainerHillFunction
goto TrainerHill_Entrance_EventScript_268314
end

8
data/maps/TrainerHill_Roof/scripts.inc
View File

@@ -5,11 +5,11 @@ TrainerHill_Roof_MapScripts:: @ 8268FA7
TrainerHill_Roof_EventScript_268FB2:: @ 8268FB2
setvar VAR_0x8004, 12
special sp194_trainer_tower
special CallTrainerHillFunction
lock
faceplayer
setvar VAR_0x8004, 1
special sp194_trainer_tower
special CallTrainerHillFunction
switch VAR_RESULT
case 0, TrainerHill_Roof_EventScript_268FEA
case 1, TrainerHill_Roof_EventScript_268FF2
@@ -20,7 +20,7 @@ TrainerHill_Roof_EventScript_268FEA:: @ 8268FEA
TrainerHill_Roof_EventScript_268FF2:: @ 8268FF2
setvar VAR_0x8004, 2
special sp194_trainer_tower
special CallTrainerHillFunction
switch VAR_RESULT
case 0, TrainerHill_Roof_EventScript_269020
case 1, TrainerHill_Roof_EventScript_269037
@@ -42,7 +42,7 @@ TrainerHill_Roof_EventScript_269037:: @ 8269037
TrainerHill_Roof_EventScript_269054:: @ 8269054
setvar VAR_0x8004, 3
special sp194_trainer_tower
special CallTrainerHillFunction
switch VAR_RESULT
case 0, TrainerHill_Roof_EventScript_269082
case 1, TrainerHill_Roof_EventScript_269090