diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-08-24 13:14:50 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-24 13:14:50 -0400 |
| commit | 74e2a0e123be0ecd0e0df516ce242aea9c348117 (patch) | |
| tree | a72251dbaad4ae8770a1895a6a416bf27fea0e50 /data | |
| parent | 3edbbb1758727fe7e74dbcba4844a186fdc8897f (diff) | |
| parent | d179300de71b214e6d5808b3780457ce41b3c92a (diff) | |
Merge pull request #88 from ultima-soul/pokedex_2
Port/Decompile pokedex.c and Dump Pokedex Entries and Text to C
Diffstat (limited to 'data')
| -rw-r--r-- | data/data_83FECCC.s | 5 | ||||
| -rw-r--r-- | data/maps/CeladonCity_Condominiums_3F/scripts.inc | 2 | ||||
| -rw-r--r-- | data/specials.inc | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/data/data_83FECCC.s b/data/data_83FECCC.s index 6aade55b6..829ee9b35 100644 --- a/data/data_83FECCC.s +++ b/data/data_83FECCC.s @@ -631,10 +631,9 @@ gUnknown_84445FA:: @ 84445FA .incbin "baserom.gba", 0x4445FA, 0x304 gUnknown_84448FE:: @ 84448FE - .incbin "baserom.gba", 0x4448FE, 0x9F52 + .incbin "baserom.gba", 0x4448FE, 0x336 -gUnknown_844E850:: @ 844E850 - .incbin "baserom.gba", 0x44E850, 0x366C + .section .rodata.8451EBC gUnknown_8451EBC:: @ 8451EBC .incbin "baserom.gba", 0x451EBC, 0x10 diff --git a/data/maps/CeladonCity_Condominiums_3F/scripts.inc b/data/maps/CeladonCity_Condominiums_3F/scripts.inc index 350bc76d0..990b7adb3 100644 --- a/data/maps/CeladonCity_Condominiums_3F/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_3F/scripts.inc @@ -16,7 +16,7 @@ CeladonCity_Condominiums_3F_EventScript_16C3ED:: @ 816C3ED CeladonCity_Condominiums_3F_EventScript_16C3F6:: @ 816C3F6 lock faceplayer - specialvar VAR_RESULT, sub_8088F58 + specialvar VAR_RESULT, HasAllKantoMons compare_var_to_value VAR_RESULT, 1 goto_if_eq EventScript_16C412 msgbox gUnknown_8196356 diff --git a/data/specials.inc b/data/specials.inc index 2524a6046..cdd41f50d 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -344,7 +344,7 @@ gSpecials:: @ 815FD60 def_special sub_807F0B0 def_special nullsub_75 def_special nullsub_75 - def_special sub_8088F58 + def_special HasAllKantoMons def_special sub_80CAD7C def_special nullsub_75 def_special sub_80E759C @@ -441,7 +441,7 @@ gSpecials:: @ 815FD60 def_special sub_8147594 def_special sub_80CD034 def_special sub_815D834 - def_special HasAllKantoMons + def_special HasAllMons def_special sub_80CD074 def_special sub_80CD098 def_special sub_811B15C |