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

6
data/battle_scripts_1.s
View File

@@ -599,7 +599,7 @@ BattleScript_EffectBide::
ppreduce
attackanimation
waitanimation
orword gHitMarker, HITMARKER_x8000000
orword gHitMarker, HITMARKER_CHARGING
setbide
goto BattleScript_MoveEnd
@@ -824,7 +824,7 @@ BattleScriptFirstChargingTurn::
ppreduce
attackanimation
waitanimation
orword gHitMarker, HITMARKER_x8000000
orword gHitMarker, HITMARKER_CHARGING
setmoveeffect MOVE_EFFECT_CHARGING | MOVE_EFFECT_AFFECTS_USER
seteffectprimary
copybyte cMULTISTRING_CHOOSER, sTWOTURN_STRINGID
@@ -1941,7 +1941,7 @@ BattleScript_SolarbeamDecideTurn::
call BattleScriptFirstChargingTurn
goto BattleScript_MoveEnd
BattleScript_SolarbeamOnFirstTurn::
orword gHitMarker, HITMARKER_x8000000
orword gHitMarker, HITMARKER_CHARGING
setmoveeffect MOVE_EFFECT_CHARGING | MOVE_EFFECT_AFFECTS_USER
seteffectprimary
ppreduce

14
data/event_scripts.s
View File

@@ -3221,7 +3221,7 @@ EventScript_2736F8:: @ 82736F8
compare VAR_RESULT, 2
goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42
setvar VAR_0x8004, 10
special sp194_trainer_tower
special CallTrainerHillFunction
compare VAR_RESULT, 1
goto_if_eq TrainerHill_1F_EventScript_2C83C9
special sub_80B05B4
@@ -7429,7 +7429,7 @@ TrainerHill_4F_MapScript1_2C8336: @ 82C8336
TrainerHill_Roof_MapScript1_2C8336: @ 82C8336
setvar VAR_TEMP_2, 0
setvar VAR_0x8004, 4
special sp194_trainer_tower
special CallTrainerHillFunction
setvar VAR_0x8004, 1
setvar VAR_0x8005, 5
special CallFrontierUtilFunc
@@ -7462,7 +7462,7 @@ TrainerHill_Roof_MapScript2_2C8381: @ 82C8381
EventScript_TrainerHillTimer:: @ 82C8393
lockall
setvar VAR_0x8004, 7
special sp194_trainer_tower
special CallTrainerHillFunction
msgbox TrainerHill_Entrance_Text_268D47, MSGBOX_DEFAULT
releaseall
end
@@ -7470,7 +7470,7 @@ EventScript_TrainerHillTimer:: @ 82C8393
TrainerHill_1F_EventScript_2C83A6:: @ 82C83A6
setvar VAR_TEMP_2, 1
setvar VAR_0x8004, 9
special sp194_trainer_tower
special CallTrainerHillFunction
compare VAR_RESULT, 1
goto_if_eq TrainerHill_1F_EventScript_2C83BF
end
@@ -7482,9 +7482,9 @@ TrainerHill_1F_EventScript_2C83BF:: @ 82C83BF
TrainerHill_1F_EventScript_2C83C9:: @ 82C83C9
setvar VAR_0x8004, 12
special sp194_trainer_tower
special CallTrainerHillFunction
setvar VAR_0x8004, 5
special sp194_trainer_tower
special CallTrainerHillFunction
setvar VAR_TEMP_1, 1
end
@@ -7502,7 +7502,7 @@ TrainerHill_1F_Movement_2C83EE:: @ 82C83EE
EventScript_2C83F0:: @ 82C83F0
trainerbattle TRAINER_BATTLE_12, TRAINER_PHILLIP, 0, BattleFrontier_BattlePyramidEmptySquare_Text_252C8D, BattleFrontier_BattlePyramidEmptySquare_Text_252C8D
setvar VAR_0x8004, 11
special sp194_trainer_tower
special CallTrainerHillFunction
waitmessage
waitbuttonpress
closemessage

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

53
data/pokenav.s
View File

@@ -2382,56 +2382,3 @@ gUnknown_0862A5A4:: @ 862A5A4
gUnknown_0862A5CC:: @ 862A5CC
.4byte gUnknown_0862A57C
.4byte gUnknown_0862A5A4
gUnknown_0862A5D4:: @ 862A5D4
.incbin "graphics/pokenav/862A5D4.gbapal"
gUnknown_0862A5F4:: @ 862A5F4
.byte 0, 2, 3, 0
gUnknown_0862A5F8:: @ 862A5F8
.4byte gUnknown_08626814
.4byte gUnknown_086276FC
.4byte gUnknown_086285E4
.4byte gUnknown_086294CC
.4byte gUnknown_085EF8B6
.4byte gUnknown_085EF8B9
.4byte gUnknown_085EF8BC
.4byte gUnknown_085EF8BF
gUnknown_0862A618:: @ 862A618
.4byte sub_81D581C
.4byte sub_81D58D8
.4byte sub_81D5924
.4byte sub_81D59D0
.4byte sub_81D5A70
.4byte sub_81D5AB4
.4byte sub_81D5AD0
.4byte sub_81D5B2C
.4byte sub_81D5BBC
.4byte sub_81D5C00
.4byte sub_81D5C5C
.4byte sub_81D62B4
.4byte sub_81D64AC
.4byte sub_81D64DC
.4byte sub_81D64FC
.4byte sub_81D6518
.4byte sub_81D6568
.4byte sub_81D65A0
gUnknown_0862A660:: @ 862A660
.4byte gUnknown_085EB32D
.4byte gUnknown_085EB33E
.4byte gUnknown_085EB350
.4byte gUnknown_085EB361
gUnknown_0862A670:: @ 862A670
.byte 0, 0x64
.4byte NULL
.2byte 0, 0x103, 17, 1, 0, 0, 0, 0, 0
gUnknown_0862A688:: @ 862A688
.2byte 0x3E, 0, 0x3F, 0, 0x40, 0, 0x41, 0
gUnknown_0862A698:: @ 862A698
.byte 0, 1, 2, 3, 4, 5, 0, 0

2
data/specials.inc
View File

@@ -515,7 +515,7 @@ gSpecials:: @ 81DBA64
def_special sub_813B514
def_special sub_813B568
def_special sub_813B534
def_special sp194_trainer_tower
def_special CallTrainerHillFunction
def_special sub_813B7D8
def_special sub_813B80C
def_special sub_81D4BEC