From cb3aa76b5148aed9acfa1c14577dfb03aee5c5d2 Mon Sep 17 00:00:00 2001 From: Rangi Date: Wed, 17 Jun 2026 11:17:09 -0400 Subject: [PATCH] Move not-yet-organized banks from `engine/dumps/` to `dumps/` for visibility --- Makefile | 2 +- {engine/dumps => dumps}/bank03.asm | 2 +- {engine/dumps => dumps}/bank05.asm | 2 +- {engine/dumps => dumps}/bank0d.asm | 2 +- {engine/dumps => dumps}/bank0e.asm | 5 +++-- {engine/dumps => dumps}/bank14.asm | 8 +++++--- engine/battle_anims/core.asm | 2 +- layout.link | 18 +++++++++--------- 8 files changed, 22 insertions(+), 19 deletions(-) rename {engine/dumps => dumps}/bank03.asm (90%) rename {engine/dumps => dumps}/bank05.asm (99%) rename {engine/dumps => dumps}/bank0d.asm (99%) rename {engine/dumps => dumps}/bank0e.asm (99%) rename {engine/dumps => dumps}/bank14.asm (99%) diff --git a/Makefile b/Makefile index 078186b2..8297cd20 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ CORRECTEDROMS := $(ROMS:%.gb=%-correctheader.gb) GOLD_BASEROM := baserom-gold.gb SILVER_BASEROM := baserom-silver.gb -DIRS := home engine data gfx audio maps scripts ram garbage +DIRS := home engine data gfx audio maps scripts ram dumps garbage FILES := BUILD := build diff --git a/engine/dumps/bank03.asm b/dumps/bank03.asm similarity index 90% rename from engine/dumps/bank03.asm rename to dumps/bank03.asm index 9224cecb..53cf36ba 100644 --- a/engine/dumps/bank03.asm +++ b/dumps/bank03.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "engine/dumps/bank03.asm@CheckTrainerBattle", ROMX +SECTION "dumps/bank03.asm@CheckTrainerBattle", ROMX _CheckTrainerBattle: xor a diff --git a/engine/dumps/bank05.asm b/dumps/bank05.asm similarity index 99% rename from engine/dumps/bank05.asm rename to dumps/bank05.asm index 0cf2927f..5faa9cf7 100644 --- a/engine/dumps/bank05.asm +++ b/dumps/bank05.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "engine/dumps/bank05.asm", ROMX +SECTION "dumps/bank05.asm", ROMX ; Early duplicate of PlayerHouse2FRadioText, which is present in the map's bank in the final game. ; Uses the long "ポケモン" and "⋯⋯⋯⋯" instead of their shortcuts, and lacks the final sentence. diff --git a/engine/dumps/bank0d.asm b/dumps/bank0d.asm similarity index 99% rename from engine/dumps/bank0d.asm rename to dumps/bank0d.asm index 836c9c32..404550f3 100644 --- a/engine/dumps/bank0d.asm +++ b/dumps/bank0d.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "engine/dumps/bank0d.asm@DoPlayerTurn", ROMX +SECTION "dumps/bank0d.asm@DoPlayerTurn", ROMX DoPlayerTurn: xor a ldh [hBattleTurn], a diff --git a/engine/dumps/bank0e.asm b/dumps/bank0e.asm similarity index 99% rename from engine/dumps/bank0e.asm rename to dumps/bank0e.asm index 62879ab8..e4815920 100644 --- a/engine/dumps/bank0e.asm +++ b/dumps/bank0e.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "engine/dumps/bank0e.asm", ROMX +SECTION "dumps/bank0e.asm", ROMX ; START OF: engine/battle/ai/items.asm @@ -2543,7 +2543,8 @@ TrainerClassAttributes: littledt AI_BASIC | AI_SETUP | AI_TYPES db 0 -SECTION "engine/dumps/bank0e.asm@ReadTrainerParty", ROMX + +SECTION "dumps/bank0e.asm@ReadTrainerParty", ROMX ; START OF: "engine/battle/read_trainer_party.asm" diff --git a/engine/dumps/bank14.asm b/dumps/bank14.asm similarity index 99% rename from engine/dumps/bank14.asm rename to dumps/bank14.asm index 5d2dc9a9..308a896c 100644 --- a/engine/dumps/bank14.asm +++ b/dumps/bank14.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "engine/dumps/bank14.asm@CopyMonToTempMon", ROMX +SECTION "dumps/bank14.asm@CopyMonToTempMon", ROMX CopyMonToTempMon:: ld a, [wCurPartyMon] @@ -151,7 +151,8 @@ GetTypeName:: ld bc, TYPE_NAME_LENGTH jp CopyBytes -SECTION "engine/dumps/bank14.asm@GetTrainerClassName_Old", ROMX + +SECTION "dumps/bank14.asm@GetTrainerClassName_Old", ROMX GetTrainerClassName_Old:: ; Seemingly unreferenced. @@ -1026,7 +1027,8 @@ ListMovePP:: jr nz, .load_loop ret -SECTION "engine/dumps/bank14.asm@Party Menu Routines", ROMX + +SECTION "dumps/bank14.asm@Party Menu Routines", ROMX ClearGraphicsForPartyMenu:: ldh a, [rLCDC] diff --git a/engine/battle_anims/core.asm b/engine/battle_anims/core.asm index 8f0fee10..34fda3b2 100644 --- a/engine/battle_anims/core.asm +++ b/engine/battle_anims/core.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "engine/dumps/bank33.asm", ROMX +SECTION "engine/battle_anims/core.asm", ROMX QueueBattleAnimation: ld hl, wActiveAnimObjects diff --git a/layout.link b/layout.link index 2afcf853..c4baa248 100644 --- a/layout.link +++ b/layout.link @@ -141,7 +141,7 @@ ROMX $03 "engine/overworld/spawn_points.asm" "data/maps/spawn_points.asm" "data/tileset_headers.asm" - "engine/dumps/bank03.asm@CheckTrainerBattle" + "dumps/bank03.asm@CheckTrainerBattle" "engine/items/inventory.asm@Inventory" "engine/smallflag.asm" "engine/pokemon/health.asm@HealParty" @@ -184,7 +184,7 @@ ROMX $05 "data/overworld_sprites.asm" "engine/menu/empty_sram.asm" "engine/events/pokecenter_pc.asm" - "engine/dumps/bank05.asm" + "dumps/bank05.asm" "garbage.asm@Bank 05 Garbage" ROMX $06 @@ -248,13 +248,13 @@ ROMX $0c "garbage.asm@Bank 0c Garbage" ROMX $0d - "engine/dumps/bank0d.asm@DoPlayerTurn" + "dumps/bank0d.asm@DoPlayerTurn" "garbage.asm@Bank 0d Garbage" ROMX $0e - "engine/dumps/bank0e.asm" + "dumps/bank0e.asm" "data/trainers/class_names.asm" - "engine/dumps/bank0e.asm@ReadTrainerParty" + "dumps/bank0e.asm@ReadTrainerParty" "data/trainers/parties.asm@Trainer Parties" "garbage.asm@Bank 0e Garbage" @@ -289,10 +289,10 @@ ROMX $13 "gfx.asm@Bank 13 Tilesets Ship Port" ROMX $14 - "engine/dumps/bank14.asm@CopyMonToTempMon" + "dumps/bank14.asm@CopyMonToTempMon" "data/types/names.asm" - "engine/dumps/bank14.asm@GetTrainerClassName_Old" - "engine/dumps/bank14.asm@Party Menu Routines" + "dumps/bank14.asm@GetTrainerClassName_Old" + "dumps/bank14.asm@Party Menu Routines" "data/pokemon/base_stats.asm" "data/pokemon/names.asm" "gfx.asm@PKMN Sprite Bank List" @@ -758,7 +758,7 @@ ROMX $32 ROMX $33 "engine/battle_anims/anim_commands.asm" - "engine/dumps/bank33.asm" + "engine/battle_anims/core.asm" "engine/battle_anims/functions.asm" "engine/battle_anims/helpers.asm"