Skip to content

Commit

Permalink
add more debug data
Browse files Browse the repository at this point in the history
  • Loading branch information
camthesaxman committed Jan 17, 2018
1 parent e11494a commit bcf3fb8
Show file tree
Hide file tree
Showing 17 changed files with 11,677 additions and 54 deletions.
4 changes: 2 additions & 2 deletions Makefile
Expand Up @@ -100,12 +100,12 @@ clean: tidy
$(RM) $(ALL_OBJECTS)
find . \( -iname '*.1bpp' -o -iname '*.4bpp' -o -iname '*.8bpp' -o -iname '*.gbapal' -o -iname '*.lz' -o -iname '*.rl' \) -exec rm {} +

ALL_BUILDS := ruby ruby_rev1 ruby_rev1 sapphire sapphire_rev1 sapphire_rev2 ruby_de sapphire_de
ALL_BUILDS := ruby ruby_rev1 ruby_rev1 sapphire sapphire_rev1 sapphire_rev2 ruby_de sapphire_de ruby_de_debug
tidy:
$(RM) $(ALL_BUILDS:%=poke%{.gba,.elf,.map})
$(RM) -r build

%.gba: %.elf
$(BUILD_NAME).gba: $(BUILD_NAME).elf
$(OBJCOPY) -O binary --gap-fill 0xFF --pad-to 0x9000000 $< $@

%.elf: $(LD_SCRIPT) $(ALL_OBJECTS)
Expand Down
7 changes: 7 additions & 0 deletions asmdiff_de_debug.sh
@@ -0,0 +1,7 @@
#!/bin/bash

OBJDUMP="$DEVKITARM/bin/arm-none-eabi-objdump -D -bbinary -marmv4t -Mforce-thumb"
OPTIONS="--start-address=$(($1)) --stop-address=$(($1 + $2))"
$OBJDUMP $OPTIONS baserom_de_debug.gba > baserom_de_debug.dump
$OBJDUMP $OPTIONS pokeruby_de_debug.gba > pokeruby_de_debug.dump
diff baserom_de_debug.dump pokeruby_de_debug.dump
5 changes: 5 additions & 0 deletions charmap.txt
Expand Up @@ -44,6 +44,7 @@ SUPER_ER = 2C
'+' = 2E
LV = 34
'=' = 35
';' = 36
'¿' = 51
'¡' = 52
PK = 53
Expand All @@ -59,6 +60,10 @@ UP_ARROW = 79
DOWN_ARROW = 7A
LEFT_ARROW = 7B
RIGHT_ARROW = 7C
SUPER_E = 84
'<' = 85
'>' = 86
SUPER_RE = A0
'0' = A1
'1' = A2
'2' = A3
Expand Down
100 changes: 50 additions & 50 deletions data-de/event_scripts.s
Expand Up @@ -3371,56 +3371,56 @@ DebugScript_081C1D46:: @ 81C1D46
giveitem ITEM_ULTRA_BALL, 84
giveitem ITEM_POKE_BALL, 89
giveitem ITEM_MASTER_BALL, 74
giveitem ITEM_TM01, 99
giveitem ITEM_TM02, 99
giveitem ITEM_TM03, 99
giveitem ITEM_TM04, 99
giveitem ITEM_TM05, 99
giveitem ITEM_TM06, 99
giveitem ITEM_TM07, 99
giveitem ITEM_TM08, 99
giveitem ITEM_TM09, 99
giveitem ITEM_TM10, 99
giveitem ITEM_TM11, 99
giveitem ITEM_TM12, 99
giveitem ITEM_TM13, 99
giveitem ITEM_TM14, 99
giveitem ITEM_TM15, 99
giveitem ITEM_TM16, 99
giveitem ITEM_TM17, 99
giveitem ITEM_TM18, 99
giveitem ITEM_TM19, 99
giveitem ITEM_TM20, 99
giveitem ITEM_TM21, 99
giveitem ITEM_TM22, 99
giveitem ITEM_TM23, 99
giveitem ITEM_TM24, 99
giveitem ITEM_TM25, 99
giveitem ITEM_TM26, 99
giveitem ITEM_TM27, 99
giveitem ITEM_TM28, 99
giveitem ITEM_TM29, 99
giveitem ITEM_TM30, 99
giveitem ITEM_TM31, 99
giveitem ITEM_TM32, 99
giveitem ITEM_TM33, 99
giveitem ITEM_TM34, 99
giveitem ITEM_TM35, 99
giveitem ITEM_TM36, 99
giveitem ITEM_TM37, 99
giveitem ITEM_TM38, 99
giveitem ITEM_TM39, 99
giveitem ITEM_TM40, 99
giveitem ITEM_TM41, 99
giveitem ITEM_TM42, 99
giveitem ITEM_TM43, 99
giveitem ITEM_TM44, 99
giveitem ITEM_TM45, 99
giveitem ITEM_TM46, 99
giveitem ITEM_TM47, 99
giveitem ITEM_TM48, 99
giveitem ITEM_TM49, 99
giveitem ITEM_TM50, 99
giveitem ITEM_TM01_FOCUS_PUNCH, 99
giveitem ITEM_TM02_DRAGON_CLAW, 99
giveitem ITEM_TM03_WATER_PULSE, 99
giveitem ITEM_TM04_CALM_MIND, 99
giveitem ITEM_TM05_ROAR, 99
giveitem ITEM_TM06_TOXIC, 99
giveitem ITEM_TM07_HAIL, 99
giveitem ITEM_TM08_BULK_UP, 99
giveitem ITEM_TM09_BULLET_SEED, 99
giveitem ITEM_TM10_HIDDEN_POWER, 99
giveitem ITEM_TM11_SUNNY_DAY, 99
giveitem ITEM_TM12_TAUNT, 99
giveitem ITEM_TM13_ICE_BEAM, 99
giveitem ITEM_TM14_BLIZZARD, 99
giveitem ITEM_TM15_HYPER_BEAM, 99
giveitem ITEM_TM16_LIGHT_SCREEN, 99
giveitem ITEM_TM17_PROTECT, 99
giveitem ITEM_TM18_RAIN_DANCE, 99
giveitem ITEM_TM19_GIGA_DRAIN, 99
giveitem ITEM_TM20_SAFEGUARD, 99
giveitem ITEM_TM21_FRUSTRATION, 99
giveitem ITEM_TM22_SOLARBEAM, 99
giveitem ITEM_TM23_IRON_TAIL, 99
giveitem ITEM_TM24_THUNDERBOLT, 99
giveitem ITEM_TM25_THUNDER, 99
giveitem ITEM_TM26_EARTHQUAKE, 99
giveitem ITEM_TM27_RETURN, 99
giveitem ITEM_TM28_DIG, 99
giveitem ITEM_TM29_PSYCHIC, 99
giveitem ITEM_TM30_SHADOW_BALL, 99
giveitem ITEM_TM31_BRICK_BREAK, 99
giveitem ITEM_TM32_DOUBLE_TEAM, 99
giveitem ITEM_TM33_REFLECT, 99
giveitem ITEM_TM34_SHOCK_WAVE, 99
giveitem ITEM_TM35_FLAMETHROWER, 99
giveitem ITEM_TM36_SLUDGE_BOMB, 99
giveitem ITEM_TM37_SANDSTORM, 99
giveitem ITEM_TM38_FIRE_BLAST, 99
giveitem ITEM_TM39_ROCK_TOMB, 99
giveitem ITEM_TM40_AERIAL_ACE, 99
giveitem ITEM_TM41_TORMENT, 99
giveitem ITEM_TM42_FACADE, 99
giveitem ITEM_TM43_SECRET_POWER, 99
giveitem ITEM_TM44_REST, 99
giveitem ITEM_TM45_ATTRACT, 99
giveitem ITEM_TM46_THIEF, 99
giveitem ITEM_TM47_STEEL_WING, 99
giveitem ITEM_TM48_SKILL_SWAP, 99
giveitem ITEM_TM49_SNATCH, 99
giveitem ITEM_TM50_OVERHEAT, 99
giveitem ITEM_CHERI_BERRY, 200
giveitem ITEM_CHERI_BERRY, 200
giveitem ITEM_CHERI_BERRY, 200
Expand Down
19 changes: 19 additions & 0 deletions data/debug_menu_3.s
@@ -0,0 +1,19 @@
.include "include/macros.inc"
.include "constants/constants.inc"

.section .rodata

_845DAE1::
.incbin "baserom_de_debug.gba", 0x45DAE1, 721
_845DDB2::
.incbin "baserom_de_debug.gba", 0x45DDB2, 1364
_845E306::
.incbin "baserom_de_debug.gba", 0x45E306, 218
_845E3E0::
.incbin "baserom_de_debug.gba", 0x45E3E0, 34
_845E402::
.incbin "baserom_de_debug.gba", 0x45E402, 32
_845E422::
.incbin "baserom_de_debug.gba", 0x45E422, 33
_845E443::
.incbin "baserom_de_debug.gba", 0x45E443, 889
229 changes: 229 additions & 0 deletions data/debug_menu_nohara.s
@@ -0,0 +1,229 @@
.include "include/macros.inc"
.include "constants/constants.inc"

.section .rodata

.ifdef DEBUG

.align 2
gUnknown_Debug_083C48C4:: @ 0x83C48C4
.string "TV$"

gUnknown_Debug_083C48C7:: @ 0x83C48C7
.string "Fan$"

gUnknown_Debug_083C48CB:: @ 0x83C48CB
.string "Battle (vs Dad)$"

gUnknown_Debug_083C48DB:: @ 0x83C48DB
.string "Dad after battle$"

gUnknown_Debug_083C48EC:: @ 0x83C48EC
.string "SOOTOPOLIS CITY$"

gUnknown_Debug_083C48FC:: @ 0x83C48FC
.string "Embark$"

gUnknown_Debug_083C4903:: @ 0x83C4903
.string "Yes 9999$"

gUnknown_Debug_083C490C:: @ 0x83C490C
.string "Legends flag ON$"

gUnknown_Debug_083C491C:: @ 0x83C491C
.string "Add num of winning streaks$"

.align 2
gUnknown_Debug_083C4938:: @ 0x83C4938
.4byte gUnknown_Debug_083C48C4, NoharaDebugMenu_TV+1
.4byte gUnknown_Debug_083C48C7, NoharaDebugMenu_Fan+1
.4byte gUnknown_Debug_083C48CB, NoharaDebugMenu_BattleVSDad+1
.4byte gUnknown_Debug_083C48DB, NoharaDebugMenu_DadAfterBattle+1
.4byte gUnknown_Debug_083C48EC, NoharaDebugMenu_SootopolisCity+1
.4byte gUnknown_Debug_083C48FC, NoharaDebugMenu_Embark+1
.4byte gUnknown_Debug_083C4903, NoharaDebugMenu_Yes9999+1
.4byte gUnknown_Debug_083C490C, NoharaDebugMenu_LegendsFlagOn+1
.4byte gUnknown_Debug_083C491C, NoharaDebugMenu_AddNumWinningStreaks+1

gUnknown_Debug_083C4980:: @ 0x83C4980
.string "Want to change data type{CLEAR_TO 143}Press Left\n"
.string "to see secret type now?{CLEAR_TO 143}to switch$"

gUnknown_Debug_083C49CA:: @ 0x83C49CA
.string "Choose the TV data you wish to\n"
.string "create to check a transmission。$"

gUnknown_Debug_083C4A09:: @ 0x83C4A09
.string "ほうそうの はっせいりつを セット\n"
.string "してください ?ぶんの1に なります$"

gUnknown_Debug_083C4A2E:: @ 0x83C4A2E
.string "SURVEY$"

gUnknown_Debug_083C4A35:: @ 0x83C4A35
.string "RECENT HAPPENINGS$"

gUnknown_Debug_083C4A47:: @ 0x83C4A47
.string "POKひMON FAN CLUB$"

gUnknown_Debug_083C4A58:: @ 0x83C4A58
.string "ジム$"

gUnknown_Debug_083C4A5B:: @ 0x83C4A5B
.string "OUTBREAKS$"

gUnknown_Debug_083C4A65:: @ 0x83C4A65
.string "NAME RATER$"

gUnknown_Debug_083C4A70:: @ 0x83C4A70
.string "CONTEST$"

gUnknown_Debug_083C4A78:: @ 0x83C4A78
.string "INTRODUCTION$"

gUnknown_Debug_083C4A85:: @ 0x83C4A85
.string "SHOPPING$"

gUnknown_Debug_083C4A8E:: @ 0x83C4A8E
.string "MISFORTUNE$"

gUnknown_Debug_083C4A99:: @ 0x83C4A99
.string "FISHING$"

gUnknown_Debug_083C4AA1:: @ 0x83C4AA1
.string "MEMORABLE DAY$"

gUnknown_Debug_083C4AAF:: @ 0x83C4AAF
.string "BRAVO TRAINER$"

gUnknown_Debug_083C4ABD:: @ 0x83C4ABD
.string "あいうるおかなにぬねのき   んぼざくゅぼざくびぼざくサぼざくナぼざくミぼざくリぼざくュぼざくズぼざくベぼざく0ぼざく·ぼざくBIG SALE$"

gUnknown_Debug_083C4B05:: @ 0x83C4B05
.string "SERVICE DAY$"

gUnknown_Debug_083C4B11:: @ 0x83C4B11
.string "CLEARーOUT SALE$"

gUnknown_Debug_083C4B20:: @ 0x83C4B20
.string "あいう {0xFC}ぼざくおぱざくちぱざく"

gUnknown_Debug_083C4B30:: @ 0x83C4B30
.string "Secret type$"

gUnknown_Debug_083C4B3C:: @ 0x83C4B3C
.string "Start$"

gUnknown_Debug_083C4B42:: @ 0x83C4B42
.string "Create TV$"

gUnknown_Debug_083C4B4C:: @ 0x83C4B4C
.string "All clear$"

gUnknown_Debug_083C4B56:: @ 0x83C4B56
.string "All seen$"

gUnknown_Debug_083C4B5F:: @ 0x83C4B5F
.string "Create CM$"

gUnknown_Debug_083C4B69:: @ 0x83C4B69
.string "Not yet seen$"

gUnknown_Debug_083C4B76:: @ 0x83C4B76
.string "Hit Table$"

gUnknown_Debug_083C4B80:: @ 0x83C4B80
.string "Set full$"

.align 2
gUnknown_Debug_083C4B8C:: @ 0x83C4B8C
.4byte gUnknown_Debug_083C4B30, debug_sub_808F4EC+1
.4byte gUnknown_Debug_083C4B3C, debug_sub_808F8AC+1
.4byte gUnknown_Debug_083C4B42, debug_sub_808F8CC+1
.4byte gUnknown_Debug_083C4B4C, debug_sub_808FEBC+1
.4byte gUnknown_Debug_083C4B56, debug_sub_808F560+1
.4byte gUnknown_Debug_083C4B5F, debug_sub_808FECC+1
.4byte gUnknown_Debug_083C4B69, debug_sub_808F594+1
.4byte gUnknown_Debug_083C4B76, debug_sub_808F5D8+1
.4byte gUnknown_Debug_083C4B80, debug_sub_80900AC+1

gUnknown_Debug_083C4BD4:: @ 0x83C4BD4
.string "しえ          しく          しこ          せか          せく          せこ          たえ          たか          たこ          つえ          つか          つこ          "

gUnknown_Debug_083C4C64:: @ 0x83C4C64
.string "TERUKUN$"

gUnknown_Debug_083C4C6C:: @ 0x83C4C6C
.string "TERUTERUDA$"

gUnknown_Debug_083C4C77:: @ 0x83C4C77
.string "1 スクル$"

gUnknown_Debug_083C4C7D:: @ 0x83C4C7D
.string "2 ミドル$"

gUnknown_Debug_083C4C83:: @ 0x83C4C83
.string "3 オジヨ$"

gUnknown_Debug_083C4C89:: @ 0x83C4C89
.string "4 ボーヤ$"

gUnknown_Debug_083C4C8F:: @ 0x83C4C8F
.string "5 ボーイ$"

gUnknown_Debug_083C4C95:: @ 0x83C4C95
.string "6 ヤング$"

gUnknown_Debug_083C4C9B:: @ 0x83C4C9B
.string "7 ヲーカ$"

gUnknown_Debug_083C4CA1:: @ 0x83C4CA1
.string "8 オルド$"

.align 2
gUnknown_Debug_083C4CA8:: @ 0x83C4CA8
.4byte gUnknown_Debug_083C4C77, gUnknown_Debug_083C4C7D
.4byte gUnknown_Debug_083C4C83, gUnknown_Debug_083C4C89
.4byte gUnknown_Debug_083C4C8F, gUnknown_Debug_083C4C95
.4byte gUnknown_Debug_083C4C9B, gUnknown_Debug_083C4CA1

gUnknown_Debug_083C4CC8:: @ 0x83C4CC8
.string "Start$"

gUnknown_Debug_083C4CCE:: @ 0x83C4CCE
.string "Increase$"

gUnknown_Debug_083C4CD7:: @ 0x83C4CD7
.string "Reduce$"

gUnknown_Debug_083C4CDE:: @ 0x83C4CDE
.string "Points$"

gUnknown_Debug_083C4CE5:: @ 0x83C4CE5
.string "Play time 6$"

gUnknown_Debug_083C4CF1:: @ 0x83C4CF1
.string "P ELITE FOUR$"

gUnknown_Debug_083C4CFE:: @ 0x83C4CFE
.string "P SECRET BASE$"

gUnknown_Debug_083C4D0C:: @ 0x83C4D0C
.string "P CONTEST$"

gUnknown_Debug_083C4D16:: @ 0x83C4D16
.string "P BATTLE TOWER$"

.align 2
gUnknown_Debug_083C4D28:: @ 0x83C4D28
.4byte gUnknown_Debug_083C4CC8, debug_sub_80901E4+1
.4byte gUnknown_Debug_083C4CCE, debug_sub_80901F8+1
.4byte gUnknown_Debug_083C4CD7, debug_sub_8090238+1
.4byte gUnknown_Debug_083C4CDE, debug_sub_809029C+1
.4byte gUnknown_Debug_083C4CE5, debug_sub_80902E4+1
.4byte gUnknown_Debug_083C4CF1, debug_sub_80902FC+1
.4byte gUnknown_Debug_083C4CFE, debug_sub_8090310+1
.4byte gUnknown_Debug_083C4D0C, debug_sub_8090324+1
.4byte gUnknown_Debug_083C4D16, debug_sub_8090338+1

.endif

0 comments on commit bcf3fb8

Please sign in to comment.