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

improve checkplayergender calls

Browse Source 
clean up constant definitions

make tweaks from review
This commit is contained in:
Melody
2018-12-24 21:22:56 -05:00
committed by Marcus Huderle
parent d59f5a8e56
commit 6d556f8cf7
35 changed files with 188 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
data/event_scripts.s
View File

@@ -1,3 +1,4 @@
#include "constants/global.h"
#include "constants/battle_frontier.h"
#include "constants/battle_setup.h"
#include "constants/event_objects.h"
@@ -1792,9 +1793,9 @@ Route110_EventScript_271ED7:: @ 8271ED7
Route119_EventScript_271ED7:: @ 8271ED7
RustboroCity_EventScript_271ED7:: @ 8271ED7
checkplayergender
compare VAR_RESULT, 0
compare VAR_RESULT, MALE
goto_if_eq RustboroCity_EventScript_271EEF
compare VAR_RESULT, 1
compare VAR_RESULT, FEMALE
goto_if_eq RustboroCity_EventScript_271EF5
end
@@ -1810,9 +1811,9 @@ LavaridgeTown_EventScript_271EFB:: @ 8271EFB
Route110_EventScript_271EFB:: @ 8271EFB
Route119_EventScript_271EFB:: @ 8271EFB
checkplayergender
compare VAR_RESULT, 0
compare VAR_RESULT, MALE
goto_if_eq LavaridgeTown_EventScript_271F13
compare VAR_RESULT, 1
compare VAR_RESULT, FEMALE
goto_if_eq LavaridgeTown_EventScript_271F19
end
@@ -1826,9 +1827,9 @@ LavaridgeTown_EventScript_271F19:: @ 8271F19
EventScript_271F1F:: @ 8271F1F
checkplayergender
compare VAR_RESULT, 0
compare VAR_RESULT, MALE
goto_if_eq EventScript_271F37
compare VAR_RESULT, 1
compare VAR_RESULT, FEMALE
goto_if_eq EventScript_271F3D
end