ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-27 13:53:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:pret/pokeemerald into battle_multi_buffer

Browse Source
This commit is contained in:
PikalaxALT 2021-03-15 09:46:57 -04:00
commit 8352ebcc48
2 changed files with 481 additions and 482 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/scripts/trainer_hill.inc
View File

@ -16,7 +16,9 @@ TrainerHill_OnWarp: @ 82C8372
TrainerHill_1F_EventScript_DummyOnWarp:: @ 82C837C TrainerHill_1F_EventScript_DummyOnWarp:: @ 82C837C
setvar VAR_TEMP_3, 1 setvar VAR_TEMP_3, 1
@ forced stop .ifdef BUGFIX
end @ Missing end. By chance, the next byte (0x02 of VAR_TEMP_2) is also the id for the end cmd
.endif
TrainerHill_OnFrame: @ 82C8381 TrainerHill_OnFrame: @ 82C8381
map_script_2 VAR_TEMP_2, 0, TrainerHill_1F_EventScript_DummyWarpToEntranceCounter map_script_2 VAR_TEMP_2, 0, TrainerHill_1F_EventScript_DummyWarpToEntranceCounter

959
src/berry_crush.c
View File

File diff suppressed because it is too large Load Diff